Re: [PATCH 0/5] make interpret-trailers useful for parsing

On Wed, Aug 9, 2017 at 10:19 AM, Junio C Hamano wrote: > Jeff King writes: > >> Parsing trailers out of a commit message is _mostly_ easy, but there >> area a lot of funny corner cases (e.g., heuristics for how many >> non-trailers must be present before a final

Re: git gc seems to break --symbolic-full-name

On Sun, Jul 23, 2017 at 12:23 PM, Stas Sergeev <s...@list.ru> wrote: > 23.07.2017 11:40, Jacob Keller пишет: >> >> On Fri, Jul 21, 2017 at 12:03 PM, Stas Sergeev <s...@list.ru> wrote: >>> >>> I wanted some kind of file to use it as a >>> build

Re: git gc seems to break --symbolic-full-name

On Sun, Jul 23, 2017 at 12:23 PM, Stas Sergeev <s...@list.ru> wrote: > 23.07.2017 11:40, Jacob Keller пишет: >> >> On Fri, Jul 21, 2017 at 12:03 PM, Stas Sergeev <s...@list.ru> wrote: >>> >>> I wanted some kind of file to use it as a >>> build

Re: git gc seems to break --symbolic-full-name

On Fri, Jul 21, 2017 at 12:03 PM, Stas Sergeev wrote: > I wanted some kind of file to use it as a > build dependency for the files that needs > to be re-built when the head changes. > This works very well besides git gc. > What other method can be used as simply > as that? git

Re: recursive grep doesn't respect --color=always inside submodules

On Sat, Jul 22, 2017 at 11:02 PM, Orgad Shaneh wrote: > Hi, > > When git grep --color=always is used, and the output is redirected to > a file or a pipe, results inside submodules are not colored. Results > in the supermodule are colored correctly. > > - Orgad This occurs

Re: [PATCH 3/3] grep: recurse in-process using 'struct repository'

On Tue, Jul 11, 2017 at 3:04 PM, Brandon Williams wrote: > Convert grep to use 'struct repository' which enables recursing into > submodules to be handled in-process. > > Signed-off-by: Brandon Williams > --- > Documentation/git-grep.txt | 7 - >

Re: [RFC PATCH] proposal for refs/tracking/* hierarchy

On Fri, Jun 23, 2017 at 1:54 PM, Junio C Hamano <gits...@pobox.com> wrote: > Jacob Keller <jacob.e.kel...@intel.com> writes: > >> Instead, lets add support for a new refs/tracking/* hierarchy which is >> laid out in such a way to avoid this inconsistency.

Re: [RFC PATCH] proposal for refs/tracking/* hierarchy

On Fri, Jun 23, 2017 at 6:52 AM, Jacob Keller <jacob.e.kel...@intel.com> wrote: > From: Jacob Keller <jacob.kel...@gmail.com> > > Historically, git has tracked the status of remote branches (heads) in > refs/remotes//*. This is necessary and useful as it allows users &

[RFC PATCH] proposal for refs/tracking/* hierarchy

From: Jacob Keller <jacob.kel...@gmail.com> Historically, git has tracked the status of remote branches (heads) in refs/remotes//*. This is necessary and useful as it allows users to track the difference between their local work and the last known status of the remote work. Unfortu

Re: [PATCH v2 4/6] config: don't implicitly use gitdir

On Tue, Jun 13, 2017 at 3:05 PM, Jonathan Nieder wrote: > Junio C Hamano wrote: >> On Tue, Jun 13, 2017 at 2:51 PM, Jonathan Nieder wrote: > >>> What is the next step, then? You can find the notion ridiculous but >>> it's how this project has worked in my

Re: proposal for how to share other refs as part of refs/tracking/*

On Tue, Jun 13, 2017 at 8:55 AM, Marc Branchaud wrote: > On 2017-06-13 10:41 AM, Marc Branchaud wrote: >> >> >> So I like your refs/tracking proposal, and hope that it aims for mirroring >> a remote's refs, to eventually replace refs/remotes entirely. > > > To be

proposal for how to share other refs as part of refs/tracking/*

Hi, There's no actual code yet, (forgive me), but I've been thinking back to a while ago about attempting to find a way to share things like refs/notes, and similar refs which are usually not shared across a remote. By default, those refs are not propagated when you do a push or a pull, and this

Re: What's cooking in git.git (Jun 2017, #03; Mon, 5)

On Mon, Jun 5, 2017 at 11:52 PM, Jacob Keller <jacob.kel...@gmail.com> wrote: > > I will try to find some time tomorrow to go over it in detail. > > Thanks, > Jake For the record, I got pulled into a project at work, so I won't have spare time to look into this for the nea

Re: What's cooking in git.git (Jun 2017, #03; Mon, 5)

On Tue, Jun 6, 2017 at 2:50 AM, Michael Haggerty wrote: > On Mon, Jun 5, 2017 at 8:23 PM, Stefan Beller wrote: >> >> > [...] >> > "git diff" has been taught to optionally paint new lines that are >> > the same as deleted lines elsewhere differently

Re: What's cooking in git.git (Jun 2017, #03; Mon, 5)

On Mon, Jun 5, 2017 at 6:10 PM, Junio C Hamano wrote: > Stefan Beller writes: > >>> "git diff" has been taught to optionally paint new lines that are >>> the same as deleted lines elsewhere differently from genuinely new >>> lines. >>> >>> Are we happy

Re: What's cooking in git.git (Jun 2017, #03; Mon, 5)

On Mon, Jun 5, 2017 at 11:23 AM, Stefan Beller wrote: >> * sb/diff-color-move (2017-06-01) 17 commits >> - diff.c: color moved lines differently >> - diff: buffer all output if asked to >> - diff.c: emit_line includes whitespace highlighting >> - diff.c: convert

Re: [PATCH] send-email: check for repo before invoking hook

On Thu, Jun 1, 2017 at 5:22 PM, Todd Zullinger wrote: > Hi Jonathan, > > Jonathan Tan wrote: >> >> Thanks for the notification. Here's a patch to fix that. --- >> git-send-email.perl | 32 +--- >> t/t9001-send-email.sh | 8 2 files changed, 25

git-send-email no longer works outside a repository?

I often use git-send-email in order to send patch files. Recently when I tried to do this outside a repository I got some cryptic failures, I'm using the master branch, git version 2.13.0.311.g0339965c70d6 I generate the patch files and copy them into a separate folder outside of the repository,

Re: [PATCH 00/31] repository object

On Thu, Jun 1, 2017 at 11:28 AM, Stefan Beller wrote: > On Thu, Jun 1, 2017 at 11:10 AM, Brandon Williams wrote: >> >> For those who don't like reviewing patches in email form, you can find >> this series at: >>

Re: [PATCHv4 00/17] Diff machine: highlight moved lines.

On Mon, May 22, 2017 at 7:40 PM, Stefan Beller wrote: > v4: > * interdiff to v3 (what is currently origin/sb/diff-color-move) below. > * renamed the "buffered_patch_line" to "diff_line". Originally I planned > to not carry the "line" part as it can be a piece of a line as

Re: [WIP/RFC 00/23] repository object

On Thu, May 18, 2017 at 4:21 PM, Brandon Williams wrote: > This is still very much in a WIP state, though it does pass all tests. What > I'm hoping for here is to get a discussion started about the feasibility of a > change like this and hopefully to get the ball rolling. Is

Re: [RESEND PATCH] diff: recurse into nested submodules for inline diff

On Thu, May 4, 2017 at 2:43 PM, Stefan Beller wrote: > When fd47ae6a5b (diff: teach diff to display submodule difference with an > inline diff, 2016-08-31) was introduced, we did not think of recursing > into nested submodules. > > When showing the inline diff for submodules,

Re: [PATCH v2] rebase -i: add config to abbreviate command-names

On Mon, Apr 24, 2017 at 11:29 PM, Junio C Hamano wrote: > Personally I am happy with the beginning of each instruction line > aligned, so from that point of view, this patch is a mild Meh to me, > even though I do a fair amount of "rebase -i" myself. But obviously > I am not

Re: I suggest a new feature: One copy from files

On Mon, Apr 24, 2017 at 4:47 PM, Rm Beer <rmbe...@gmail.com> wrote: > 2017-04-24 3:13 GMT-03:00 Jacob Keller <jacob.kel...@gmail.com>: >> So, clearly you haven't defined the request very well. It *sounds* >> like what you want is the ability to say "git please

Re: [PATCH v4 0/9] Introduce timestamp_t for timestamps

On Sun, Apr 23, 2017 at 8:29 PM, Junio C Hamano wrote: > Johannes Schindelin writes: > >> Changes since v3: >> >> - fixed the fix in archive-zip.c that tried to report a too large >> timestamp (and would have reported the uninitialized time_t

Re: I suggest a new feature: One copy from files

On Sun, Apr 23, 2017 at 8:47 PM, Rm Beer wrote: > I have a several directories with binary files datas that is discard > by .gitignore. > > I recommend make a new .gitonecopy or .gitonelog or something that > take the directories with only 1 copy of last updated and not take >

Re: [PATCH] completion: optionally disable checkout DWIM

On Thu, Apr 20, 2017 at 1:12 PM, Jeff King wrote: > When we complete branch names for "git checkout", we also > complete remote branch names that could trigger the DWIM > behavior. Depending on your workflow and project, this can > be either convenient or annoying. > > For

Re: [RFC PATCH] parse-options: disallow double-negations of options starting with no-

On Wed, Apr 19, 2017 at 2:22 PM, Jacob Keller <jacob.kel...@gmail.com> wrote: > On Wed, Apr 19, 2017 at 2:00 PM, Jeff King <p...@peff.net> wrote: >> On Wed, Apr 19, 2017 at 01:54:06PM -0700, Jacob Keller wrote: >> >>> This is why it's an RFC. I don't really feel

Re: [RFC PATCH] parse-options: disallow double-negations of options starting with no-

On Wed, Apr 19, 2017 at 2:00 PM, Jeff King <p...@peff.net> wrote: > On Wed, Apr 19, 2017 at 01:54:06PM -0700, Jacob Keller wrote: > >> This is why it's an RFC. I don't really feel that it's too much of a >> problem. As for the reason why I thought it might want a f

Re: [RFC PATCH] parse-options: disallow double-negations of options starting with no-

On Wed, Apr 19, 2017 at 8:10 AM, Jeff King <p...@peff.net> wrote: > On Wed, Apr 19, 2017 at 02:08:20AM -0700, Jacob Keller wrote: > >> From: Jacob Keller <jacob.kel...@gmail.com> >> >> Many options can be negated by prefixing the option with "no-&

Re: [PATCH] various: disallow --no-no-OPT for --no-opt options

On Wed, Apr 19, 2017 at 12:02 AM, Ævar Arnfjörð Bjarmason wrote: > On Wed, Apr 19, 2017 at 4:50 AM, Jeff King wrote: >> On Tue, Apr 18, 2017 at 07:40:37PM -0700, Junio C Hamano wrote: >> >>> > It might even be possible to detect the existing line and >>> > have

[RFC PATCH] parse-options: disallow double-negations of options starting with no-

From: Jacob Keller <jacob.kel...@gmail.com> Many options can be negated by prefixing the option with "no-", for example "--3way" can be prefixed with "--no-3way" to disable it. Since 0f1930c58754 ("parse-options: allow positivation of options starting

Re: [PATCH v2 2/2] ls-files: fix path used when recursing into submodules

On Mon, Apr 17, 2017 at 7:03 PM, Junio C Hamano <gits...@pobox.com> wrote: > Jacob Keller <jacob.e.kel...@intel.com> writes: > >> From: Jacob Keller <jacob.kel...@gmail.com> >> >> Don't assume that the current working directory is the root of the

Re: How to keep log history when renaming and changing simultaneously

On Mon, Apr 17, 2017 at 2:36 PM, Urs Thuermann wrote: > Igor Djordjevic writes: > >> For both cases (renaming and splitting), would using `--find-copies` >> work for you? Perhaps with some low threshold value to start with, if >> the default

Re: [PATCH] doc: trivial typo in git-format-patch.txt

On Mon, Apr 17, 2017 at 3:32 PM, Giuseppe Bilotta wrote: > Signed-off-by: Giuseppe Bilotta > --- > Documentation/git-format-patch.txt | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git

Re: Index files autocompletion too slow in big repositories (w / suggestion for improvement)

On Sat, Apr 15, 2017 at 4:59 AM, Johannes Sixt wrote: > Cc Gábor. > > Am 15.04.2017 um 00:33 schrieb Ævar Arnfjörð Bjarmason: >> >> On Sat, Apr 15, 2017 at 12:08 AM, Carlos Pita >> wrote: >>> >>> This is much faster (below 0.1s): >>> >>> __git_index_files

Re: Index files autocompletion too slow in big repositories (w / suggestion for improvement)

On Fri, Apr 14, 2017 at 3:33 PM, Ævar Arnfjörð Bjarmason wrote: > On Sat, Apr 15, 2017 at 12:08 AM, Carlos Pita > wrote: >> This is much faster (below 0.1s): >> >> __git_index_files () >> { >> local dir="$(__gitdir)" root="${2-.}" file; >> if

Re: [PATCH 3/2] ls-files: only recurse on active submodules

On Fri, Apr 14, 2017 at 10:02 AM, Stefan Beller <sbel...@google.com> wrote: > On Fri, Apr 14, 2017 at 9:33 AM, Jacob Keller <jacob.kel...@gmail.com> wrote: >> >> Never mind. git ls-files doesn't support showing files for a specific >> ancient history. (I guess

Re: [PATCH 3/2] ls-files: only recurse on active submodules

On Thu, Apr 13, 2017 at 12:25 PM, Stefan Beller <sbel...@google.com> wrote: > On Thu, Apr 13, 2017 at 12:12 PM, Jacob Keller <jacob.kel...@gmail.com> wrote: >> On Thu, Apr 13, 2017 at 12:05 PM, Stefan Beller <sbel...@google.com> wrote: >>> On Thu, Apr 13, 201

Re: [PATCH] worktree add: add --lock option

On Thu, Apr 13, 2017 at 3:50 PM, Junio C Hamano wrote: > Nguyễn Thái Ngọc Duy writes: > >> As explained in the document. This option has an advantage over the >> command sequence "git worktree add && git worktree lock": there will be >> no gap that somebody

Re: [PATCH] repack: respect gc.pid lock

On Thu, Apr 13, 2017 at 1:27 PM, David Turner wrote: > Git gc locks the repository (using a gc.pid file) so that other gcs > don't run concurrently. Make git repack respect this lock. > > Now repack, by default, will refuse to run at the same time as a gc. > This fixes a

Re: [PATCH 3/2] ls-files: only recurse on active submodules

On Thu, Apr 13, 2017 at 12:25 PM, Stefan Beller <sbel...@google.com> wrote: > On Thu, Apr 13, 2017 at 12:12 PM, Jacob Keller <jacob.kel...@gmail.com> wrote: >> On Thu, Apr 13, 2017 at 12:05 PM, Stefan Beller <sbel...@google.com> wrote: >>> On Thu, Apr 13, 201

Re: [PATCH 3/2] ls-files: only recurse on active submodules

On Thu, Apr 13, 2017 at 12:05 PM, Stefan Beller wrote: > On Thu, Apr 13, 2017 at 11:57 AM, Brandon Williams wrote: >> Add in a check to see if a submodule is active before attempting to >> recurse. This prevents 'ls-files' from trying to operate on a

Re: Simultaneous gc and repack

On Thu, Apr 13, 2017 at 11:28 AM, David Turner <nova...@novalis.org> wrote: > On Thu, 2017-04-13 at 12:08 -0600, Martin Fick wrote: >> On Thursday, April 13, 2017 11:03:14 AM Jacob Keller wrote: >> > On Thu, Apr 13, 2017 at 10:31 AM, David Turner >> >> <no

Re: [PATCH v2 2/2] ls-files: fix path used when recursing into submodules

On Thu, Apr 13, 2017 at 11:15 AM, Stefan Beller <sbel...@google.com> wrote: > On Thu, Apr 13, 2017 at 10:12 AM, Jacob Keller <jacob.e.kel...@intel.com> > wrote: >> From: Jacob Keller <jacob.kel...@gmail.com> >> >> Don't assume that the current working

Re: [PATCH v2 1/2] ls-files: fix recurse-submodules with nested submodules

On Thu, Apr 13, 2017 at 11:03 AM, Brandon Williams <bmw...@google.com> wrote: > On 04/13, Jacob Keller wrote: >> From: Jacob Keller <jacob.kel...@gmail.com> >> >> Since commit e77aa336f116 ("ls-files: optionally recurse into >> submodules&quo

Re: Simultaneous gc and repack

On Thu, Apr 13, 2017 at 10:31 AM, David Turner wrote: > Git gc locks the repository (using a gc.pid file) so that other gcs > don't run concurrently. But git repack doesn't respect this lock, so > it's possible to have a repack running at the same time as a gc. This > makes

[PATCH v2 2/2] ls-files: fix path used when recursing into submodules

From: Jacob Keller <jacob.kel...@gmail.com> Don't assume that the current working directory is the root of the repository. Correctly generate the path for the recursing child processes by building it from the work_tree() root instead. Otherwise if we run ls-files using --git-dir or --wor

[PATCH v2 1/2] ls-files: fix recurse-submodules with nested submodules

From: Jacob Keller <jacob.kel...@gmail.com> Since commit e77aa336f116 ("ls-files: optionally recurse into submodules", 2016-10-07) ls-files has known how to recurse into submodules when displaying files. Unfortunately this fails for certain cases, including when nesting more th

Re: [PATCH 7/7] Do not use curl_easy_strerror with curl < 7.12.0

On Wed, Apr 12, 2017 at 11:28 PM, Junio C Hamano wrote: > Jeff King writes: > >> On Wed, Apr 05, 2017 at 03:04:24PM +0200, Tom G. Christensen wrote: >> ... >> These kinds of interleaved conditionals make me nervous that we'll get >> something wrong (especially

Re: [PATCH] status: show in-progress info for short status

On Wed, Apr 12, 2017 at 11:09 PM, Junio C Hamano <gits...@pobox.com> wrote: > Jacob Keller <jacob.kel...@gmail.com> writes: > >> Personally, I would want this to become the default and not have a new >> option to trigger it. I think we could also extend the

Re: [PATCH] status: show in-progress info for short status

On Wed, Apr 12, 2017 at 11:09 PM, Junio C Hamano <gits...@pobox.com> wrote: > Jacob Keller <jacob.kel...@gmail.com> writes: > >> Personally, I would want this to become the default and not have a new >> option to trigger it. I think we could also extend the

Re: [PATCH] ls-files: properly prepare submodule environment

On Wed, Apr 12, 2017 at 9:58 AM, Brandon Williams <bmw...@google.com> wrote: > On 04/11, Jacob Keller wrote: >> From: Jacob Keller <jacob.kel...@gmail.com> >> >> Since commit e77aa336f116 ("ls-files: optionally recurse into >> submodules&quo

[PATCH] ls-files: properly prepare submodule environment

From: Jacob Keller <jacob.kel...@gmail.com> Since commit e77aa336f116 ("ls-files: optionally recurse into submodules", 2016-10-07) ls-files has known how to recurse into submodules when displaying files. Unfortunately this code does not work as expected. Initially, it produced re

Re: Tools that do an automatic fetch defeat "git push --force-with-lease"

On Mon, Apr 10, 2017 at 2:58 AM, Ævar Arnfjörð Bjarmason <ava...@gmail.com> wrote: > On Mon, Apr 10, 2017 at 10:08 AM, Jacob Keller <jacob.kel...@gmail.com> wrote: >> On Sun, Apr 9, 2017 at 4:00 AM, Stefan Haller <hal...@ableton.com> wrote: >>> Jacob K

Re: Tools that do an automatic fetch defeat "git push --force-with-lease"

On Sun, Apr 9, 2017 at 4:00 AM, Stefan Haller <hal...@ableton.com> wrote: > Jacob Keller <jacob.kel...@gmail.com> wrote: > >> Agreed. You "take" a lease whenever you push to the remote or when you >> pull from the remote and when you pull into the branch.

Re: Tools that do an automatic fetch defeat "git push --force-with-lease"

On Sun, Apr 9, 2017 at 1:38 AM, Stefan Haller wrote: > Jeff King wrote: > >> > It might be possible to generate these lease tags prior to operations >> > which modify history and then maybe having a way to list them so you >> > can select which one you meant

Re: Tools that do an automatic fetch defeat "git push --force-with-lease"

On Sun, Apr 9, 2017 at 1:38 AM, Stefan Haller <li...@haller-berlin.de> wrote: > Jacob Keller <jacob.kel...@gmail.com> wrote: > >> What if we added a separate command something like: >> >> git create-lease >> >> which you're expected to run at the

Re: Tools that do an automatic fetch defeat "git push --force-with-lease"

On Sat, Apr 8, 2017 at 3:13 PM, Jeff King <p...@peff.net> wrote: > On Sat, Apr 08, 2017 at 02:54:29PM -0700, Jacob Keller wrote: > >> > So the best way to use it is something like: >> > >> > git fetch ;# update 'master' from remote >>

Re: Tools that do an automatic fetch defeat "git push --force-with-lease"

On Sat, Apr 8, 2017 at 2:29 AM, Jeff King wrote: > On Sat, Apr 08, 2017 at 09:35:04AM +0200, Ævar Arnfjörð Bjarmason wrote: > >> Is it correct that you'd essentially want something that works like: >> >> git push --force-with-lease=master:master origin master:master > > I don't

Re: Tools that do an automatic fetch defeat "git push --force-with-lease"

On Fri, Apr 7, 2017 at 7:15 PM, Matt McCutchen wrote: > When I'm rewriting history, "git push --force-with-lease" is a nice > safeguard compared to "git push --force", but it still assumes the > remote-tracking ref gives the old state the user wants to overwrite. > Tools

Re: [PATCH] status: show in-progress info for short status

On Fri, Mar 31, 2017 at 11:14 AM, Junio C Hamano wrote: > Michael J Gruber writes: > >> Ordinary (long) status shows information about bisect, revert, am, >> rebase, cherry-pick in progress, and so does git-prompt.sh. status >> --short currently shows none of

Re: [PATCH] Documentation/git-worktree: use working tree for trees on the file system

On Fri, Apr 7, 2017 at 6:59 AM, Michael J Gruber wrote: > Duy Nguyen venit, vidit, dixit 25.03.2017 13:07: >> On Fri, Mar 24, 2017 at 12:55 AM, Junio C Hamano wrote: >>> Michael J Gruber writes: >>> Are we at a point where we

Re: [PATCH v2 2/2] push: propagate push-options with --recurse-submodules

On Fri, Mar 31, 2017 at 5:19 PM, Jonathan Nieder wrote: > Brandon Williams wrote: > >> Teach push --recurse-submodules to propagate push-options recursively to >> the pushes performed in the submodules. > > Some time in the future we may want "push --recurse-submodules" to do

Re: git diff --submodule=diff fails with submodules in a submodule

On Fri, Mar 31, 2017 at 10:07 AM, Stefan Beller wrote: > +cc Jacob, who implemented --submodule=diff > > On Fri, Mar 31, 2017 at 8:40 AM, David Parrish wrote: >> When I try to run `git diff --submodule=diff` in a submodule which has >> it's own

Re: [RFC PATCH] change default for status.submoduleSummary to true

On Wed, Mar 29, 2017 at 6:20 PM, Stefan Beller wrote: > A user complained about the workflow with submodules: >> Re submodules pain, I've seen a lot of people get confused about >> how and when to commit submodule changes. The main thing missing >> in the related UIs is some

Re: [PATCH RFC 2/2] diff: teach diff to expand tabs in output

On Tue, Mar 28, 2017 at 12:03 PM, Junio C Hamano <gits...@pobox.com> wrote: > Jacob Keller <jacob.e.kel...@intel.com> writes: > >> I'm really not a fan of how the ws code ended up. It seems pretty ugly >> and weird to hack in the expand_tabs stuff here. However, I'm

Re: Re: Microproject | Add more builtin patterns for userdiff

On Tue, Mar 28, 2017 at 10:53 AM, Pickfire wrote: > > Yes, I can't reproduce it outside the test suite. I have added the builtin > and yet the test fails. test_decode_color gets same output as expect but > still it fails, should I send in the patch? You also need to ensure

Re: Microproject | Add more builtin patterns for userdiff

On Tue, Mar 28, 2017 at 3:46 AM, Pickfire wrote: > While I was working buildins shell patterns for user diffs. I noticed that > the tests t4034 passes but I can reproduce it manually with: > > mkdir cpp/ && cd cpp/ && git init > > cat > pre < Foo():x(0&&1){} >

[PATCH RFC 2/2] diff: teach diff to expand tabs in output

From: Jacob Keller <jacob.kel...@gmail.com> When creating a diff for contents, we prepend a single character to represent the state of that line. This character can offset how the tabs in the real content are displayed, which may result in weird alignment issues when viewing the diffs.

[PATCH RFC 1/2] strbuf: move strbuf_add_tabexpand into strbuf.c

From: Jacob Keller <jacob.kel...@gmail.com> In commit 7cc13c717b52 ("pretty: expand tabs in indented logs to make things line up properly", 2016-03-16) a new function was added to insert a line into a strbuf while expanding the tabs into spaces. This functionality was used to h

Re: Use base32?

On Sun, Mar 19, 2017 at 10:58 PM, Michael Steuer wrote: > > On 20/03/2017 16:21, Jason Hennessey wrote: >> >> On Wed, 8 Mar 2017, Johannes Schindelin wrote: Linus Torvalds writes ("Re: RFC: Another proposed hash function transition plan"): > > Of

Re: [PATCH 0/2] Teach name-rev to pay more attention to lightweight tags

On Wed, Mar 15, 2017 at 3:50 PM, Junio C Hamano wrote: > Here is a reroll of what I did in > > http://public-inbox.org/git/xmqqd1die00j@gitster.mtv.corp.google.com/ > > Junio C Hamano (2): > name-rev: refactor logic to see if a new candidate is a better name >

Re: Finding a tag that introduced a submodule change

On Wed, Mar 15, 2017 at 10:10 AM, Stefan Beller wrote: > On Fri, Mar 3, 2017 at 7:40 AM, Robert Dailey > wrote: >> I have a repository with a single submodule in it. Since the parent >> repository represents the code base for an actual product, I

Re: git-push branch confusion caused by user mistake

On Fri, Mar 10, 2017 at 2:13 PM, Junio C Hamano wrote: > Phil Hord writes: > >> I think git should be smarter about deducing the dest ref from the >> source ref if the source ref is in refs/remotes, but I'm not sure how >> far to take it. > > My knee-jerk

Re: diff.ignoreSubmoudles config setting broken?

On Wed, Mar 8, 2017 at 11:04 AM, Stefan Beller <sbel...@google.com> wrote: > On Wed, Mar 8, 2017 at 7:07 AM, Sebastian Schuberth > <sschube...@gmail.com> wrote: >> >> + Jens >> > > + Jacob Keller, who touched submodule diff display code last. >

Re: Finding a tag that introduced a submodule change

On Fri, Mar 3, 2017 at 7:40 AM, Robert Dailey wrote: > I have a repository with a single submodule in it. Since the parent > repository represents the code base for an actual product, I tag > release versions in the parent repository. I do not put tags in the > submodule

Re: [PATCH 3/4] filter-branch: fix --prune-empty on parentless commits

On Thu, Mar 2, 2017 at 11:36 AM, Junio C Hamano wrote: > "Devin J. Pohly" writes: > >> I think your point is interesting too, though. If a commit is also >> TREESAME to its parent(s?) in the _pre-filtered_ branch, it seems >> reasonable that someone might

Re: [PATCH v2] fixing corner-cases with interpret_branch_name()

On Thu, Mar 2, 2017 at 12:21 AM, Jeff King wrote: > This is a re-roll of the series from: > > > http://public-inbox.org/git/20170228120633.zkwfqms57fk7d...@sigill.intra.peff.net/ > > Thanks Junio and Jake for reviewing the original. This is mostly the > same, but: > > - it

Re: [BUG] branch renamed to 'HEAD'

On Tue, Feb 28, 2017 at 4:06 AM, Jeff King wrote: > On Mon, Feb 27, 2017 at 07:53:02PM -0500, Jeff King wrote: > >> On Mon, Feb 27, 2017 at 04:33:36PM -0800, Junio C Hamano wrote: >> >> > A flag to affect the behaviour (as opposed to as a secondary >> > return value, like Peff's

Re: [BUG] branch renamed to 'HEAD'

On Mon, Feb 27, 2017 at 4:53 PM, Jeff King wrote: > On Mon, Feb 27, 2017 at 04:33:36PM -0800, Junio C Hamano wrote: > >> A flag to affect the behaviour (as opposed to as a secondary >> return value, like Peff's patch does) can be made to work. Perhaps >> a flag that says "keep

Re: [BUG] branch renamed to 'HEAD'

On Mon, Feb 27, 2017 at 2:28 PM, Junio C Hamano wrote: > Jeff King writes: > >> I guess something like the patch below works, but I wonder if there is a >> less-horrible way to accomplish the same thing. > > I suspect that a less-horrible would be a lot more

Re: SHA1 collisions found

On Fri, Feb 24, 2017 at 5:39 PM, David Lang wrote: > On Fri, 24 Feb 2017, Jeff King wrote: > >>> what if they are forks of each other? (LEDE and OpenWRT, or just >>> linux-kernel and linux-kernel-stable) >> >> >> Once one flips, the other one needs to flip to, or can't interact

Re: SHA1 collisions found

On Fri, Feb 24, 2017 at 5:21 PM, Jeff King wrote: > On Fri, Feb 24, 2017 at 05:00:55PM -0800, David Lang wrote: > >> On Fri, 24 Feb 2017, Jeff King wrote: >> >> > >> > So I'd much rather see strong rules like: >> > >> > 1. Once a repo has flag-day switched over to the new hash

Re: [PATCH 12/15] unpack-trees: check if we can perform the operation for submodules

On Tue, Feb 21, 2017 at 3:44 PM, Stefan Beller <sbel...@google.com> wrote: > On Tue, Feb 21, 2017 at 3:35 PM, Jacob Keller <jacob.kel...@gmail.com> wrote: >> On Tue, Feb 21, 2017 at 2:16 PM, Stefan Beller <sbel...@google.com> wrote: >>> On Fri, Feb 17, 2017

Re: [PATCH 12/15] unpack-trees: check if we can perform the operation for submodules

On Tue, Feb 21, 2017 at 2:16 PM, Stefan Beller <sbel...@google.com> wrote: > On Fri, Feb 17, 2017 at 10:42 AM, Jacob Keller <jacob.kel...@gmail.com> wrote: >> On Wed, Feb 15, 2017 at 4:38 PM, Stefan Beller <sbel...@google.com> wrote: >>> + if (

Re: [PATCH 06/15] update submodules: add submodule config parsing

On Tue, Feb 21, 2017 at 11:42 AM, Stefan Beller <sbel...@google.com> wrote: > On Fri, Feb 17, 2017 at 10:24 AM, Jacob Keller <jacob.kel...@gmail.com> wrote: >> >> Ok so this function here reads a recurse submodules parameter which is >> a boolean or it can be set

Re: [RFC PATCH] show decorations at the end of the line

On Sun, Feb 19, 2017 at 2:33 PM, Linus Torvalds wrote: > On Fri, Feb 17, 2017 at 9:27 PM, Junio C Hamano wrote: >> >> I just got bitten by a fallout. I have >> >> $ git recent --help >> `git recent' is aliased to `log --oneline

Re: Git bisect does not find commit introducing the bug

On Sun, Feb 19, 2017 at 11:05 AM, Alex Hoffman wrote: >> Then you must adjust your definition of "good": All commits that do not have >> the feature, yet, are "good": since they do not have the feature in the >> first place, they cannot have the breakage that you found in the

Re: [PATCH] git-check-ref-format: fix typo in man page

On Sat, Feb 18, 2017 at 2:47 PM, Damien Regad wrote: > > --- > Documentation/git-check-ref-format.txt | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/Documentation/git-check-ref-format.txt > b/Documentation/git-check-ref-format.txt > index

Re: [PATCH 12/15] unpack-trees: check if we can perform the operation for submodules

On Wed, Feb 15, 2017 at 4:38 PM, Stefan Beller wrote: > + if (is_active_submodule_with_strategy(ce, SM_UPDATE_UNSPECIFIED)) Here, and in other cases where we use is_active_submodule_with_strategy(), why do we only ever check SM_UPDATE_UNSPECIFIED? It seems really weird

Re: [PATCH 08/15] submodules: introduce check to see whether to touch a submodule

On Wed, Feb 15, 2017 at 4:38 PM, Stefan Beller wrote: > 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

Re: [PATCH 06/15] update submodules: add submodule config parsing

On Wed, Feb 15, 2017 at 4:38 PM, Stefan Beller wrote: > 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

Re: [RFCv4 PATCH 00/14] Checkout aware of Submodules!

On Thu, Feb 16, 2017 at 2:56 PM, Stefan Beller <sbel...@google.com> wrote: > On Thu, Feb 16, 2017 at 2:54 PM, Jacob Keller <jacob.kel...@gmail.com> wrote: >> On Thu, Feb 16, 2017 at 2:00 PM, Junio C Hamano <gits...@pobox.com> wrote: >>> Stefan Beller <sbel...

Re: [RFCv4 PATCH 00/14] Checkout aware of Submodules!

On Thu, Feb 16, 2017 at 2:00 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> Integrate updating the submodules into git checkout,... > > It was more or less a pleasant read, once I decided to pretend that > I were a machine who uses identifiers only

Re: There are too many unreachable loose objects

On Thu, Feb 16, 2017 at 1:58 PM, Hilco Wijbenga wrote: > Hi all, > > Whenever I run "git push --force(-with-lease)" I get a variation of > > Counting objects: 187, done. > Delta compression using up to 12 threads. > Compressing objects: 100% (126/126), done. > Writing

Re: [PATCH 08/15] submodules: introduce check to see whether to touch a submodule

On Wed, Feb 15, 2017 at 4:38 PM, Stefan Beller wrote: > +int touch_submodules_in_worktree(void) > +{ > + /* > +* Update can't be "none", "merge" or "rebase", > +* treat any value as OFF, except an explicit ON. > +*/ > + return

Re: [PATCH v3] reset: add an example of how to split a commit into two

On Thu, Feb 16, 2017 at 11:49 AM, Junio C Hamano <gits...@pobox.com> wrote: > Junio C Hamano <gits...@pobox.com> writes: > >> Jacob Keller <jacob.e.kel...@intel.com> writes: >> >>> The interdiff between v2 and v3 is not really worth showing since I &g

[PATCH v3] reset: add an example of how to split a commit into two

From: Jacob Keller <jacob.kel...@gmail.com> It is often useful to break a commit into multiple parts that are more logical separations. This can be tricky to learn how to do without the brute-force method if re-writing code or commit messages from scratch. Add a section to the git

Re: Request re git status

On Tue, Feb 7, 2017 at 10:13 PM, Duy Nguyen <pclo...@gmail.com> wrote: > On Wed, Feb 8, 2017 at 2:18 AM, Jacob Keller <jacob.kel...@gmail.com> wrote: >> Personally, I think that the fact that Git forces the user to think >> about it in terms of "oh I have to

<    1   2   3   4   5   6   7   8   9   10   >