[PATCH RFC v2 25/25] cat-file: update of docs

2018-02-05 Thread Olga Telezhnaya
Update the docs for cat-file command. Some new formatting atoms added because of reusing ref-filter code. We do not support cat-file atoms in general formatting logic (there is just the support for cat-file), that is why some of the atoms are still explained in cat-file docs. We need to move

Re: [PATCH v2 07/14] commit-graph: implement git-commit-graph --update-head

2018-02-01 Thread SZEDER Gábor
graph in bare repo' \ > 'graphbare=$(git commit-graph --write) && > test_path_is_file ${baredir}/graph-${graphbare}.graph && > + test_path_is_file ${baredir}/graph-head && This test and the one preceeding it are wrong. Note that 'git commit-graph --write' above is

Re: [PATCH v2 07/14] commit-graph: implement git-commit-graph --update-head

2018-02-01 Thread SZEDER Gábor
h --read, consider the graph file graph-.graph. > + > +--write:: > + Write a new graph file to the pack directory. (Cannot be combined > + with --read.) I think this should also mention that it prints the generated graph file's checksum. > + > +--update-head:: > +

[PATCH v2 07/14] commit-graph: implement git-commit-graph --update-head

2018-01-30 Thread Derrick Stolee
d file and output basic + details about the graph file. (Cannot be combined with --write.) + +--graph-id:: + When used with --read, consider the graph file graph-.graph. + +--write:: + Write a new graph file to the pack directory. (Cannot be combined + with --read.) + +--updat

[PATCH RFC 24/24] cat-file: update of docs

2018-01-26 Thread Olga Telezhnaya
Update the docs for cat-file command. Some new formatting atoms added because of reusing ref-filter code. We do not support cat-file atoms in general formatting logic (there is just the support for cat-file), that is why some of the atoms are still explained in cat-file docs. We need to move

[PATCH 08/14] graph: implement git-graph --update-head

2018-01-25 Thread Derrick Stolee
mbined with --write.) + +--graph-id:: + When used with --read, consider the graph file graph-.graph. + +--write:: + Write a new graph file to the pack directory. (Cannot be combined + with --read.) + +--update-head:: + When used with --write, update the graph-head file to

[PATCH 4/5] update-index doc: note a fixed bug in the untracked cache

2018-01-24 Thread Nguyễn Thái Ngọc Duy
s is user visible, and thus it makes sense for these docs to focus on the symlink case only. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> Signed-off-by: Junio C Hamano <gits...@pobox.com> Signed-off-by: Nguyễn Thái Ngọc Duy <pclo...@gmail.com> --- Documentation/git-upda

[PATCH 0/3] nd/shared-index-fix update

2018-01-22 Thread Nguyễn Thái Ngọc Duy
mp; @@ -409,11 +409,11 @@ test_expect_success POSIXPERM 'graceful handling splitting index is not allowed' git update-index --split-index && test -f .git/sharedindex.* ) && - test_when_finished "chmod -R u+w ro" && -

[PATCH v5 3/4] status: update short status to respect --no-ahead-behind

2018-01-09 Thread Jeff Hostetler
From: Jeff Hostetler Teach "git status --short --branch" to respect "--no-ahead-behind" parameter to skip computing ahead/behind counts for the branch and its upstream and just report '[different]'. Signed-off-by: Jeff Hostetler ---

[PATCH v4 3/4] status: update short status to respect --no-ahead-behind

2018-01-08 Thread Jeff Hostetler
From: Jeff Hostetler Teach "git status --short --branch" to respect "--no-ahead-behind" parameter to skip computing ahead/behind counts for the branch and its upstream and just report '[different]'. Short status also respect the "status.aheadBehind" config setting.

[RFC PATCH 07/18] midx: teach midx --write to update midx-head

2018-01-07 Thread Derrick Stolee
ied, write a new midx file to the pack directory using the packfiles present. Outputs the hash of the result midx file. +--update-head:: + If specified with --write, update the midx-head file to point to + the written midx file. + EXAMPLES +* Read the midx-head file and outpu

Documentation for update-index

2018-01-06 Thread Rasmus Villemoes
The man page for update-index says -q Quiet. If --refresh finds that the index needs an update, the default behavior is to error out. This option makes git update-index continue anyway. --ignore-submodules Do not try to update submodules

[PATCHv4 3/4] unpack-trees: oneway_merge to update submodules

2018-01-05 Thread Stefan Beller
When there is a one way merge, each submodule needs to be one way merged as well, if we're asked to recurse into submodules. In case of a submodule, check if it is up-to-date, otherwise set the flag CE_UPDATE, which will trigger an update of it in the phase updating the tree later. Signed-off

Re: Recommendation for consistent update on invoke of "sha1_to_hex()"

2018-01-04 Thread Jeff King
On Fri, Jan 05, 2018 at 11:26:01AM +0800, 牛旭 wrote: > By mining historical patches, we suggest that invokes of sha1_to_hex() > should be replaced with that of oid_to_hex(). One example for > recommendation and corresponding patch are listed as follows.  Note that these two functions take

Recommendation for consistent update on invoke of "sha1_to_hex()"

2018-01-04 Thread 牛旭
Our team researches on consistent update of Git during evolution. And we have figured out several spots that may be missed.  By mining historical patches, we suggest that invokes of sha1_to_hex() should be replaced with that of oid_to_hex(). One example for recommendation and corresponding

Re: [PATCH 3/6] fsmonitor: Update helper tool, now that flags are filled later

2018-01-04 Thread Johannes Schindelin
return 1; > + } It took me a while to reason about this: - there is no existing code path that can return -1 from git_config_get_fsmonitor(), - the callers in builtin/update-index.c (testing explicitly for 0 and 1) do not matter because they only trigger warnings. - the remaining two

[PATCH v3 3/5] status: update short status to respect --no-ahead-behind

2018-01-03 Thread Jeff Hostetler
From: Jeff Hostetler Teach "git status --short --branch" to respect "--no-ahead-behind" parameter to skip computing ahead/behind counts for the branch and its upstream and just report '[different]'. Short status also respect the "status.aheadBehind" config setting.

[PATCH v2 4/5] update-index doc: note a fixed bug in the untracked cache

2018-01-03 Thread Ævar Arnfjörð Bjarmason
s to focus on the symlink case only. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- Documentation/git-update-index.txt | 16 1 file changed, 16 insertions(+) diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt index bdb0342593..1

[PATCH 4/5] unpack-trees: oneway_merge to update submodules

2018-01-02 Thread Stefan Beller
When there is a one way merge, each submodule needs to be one way merged as well, if we're asked to recurse into submodules. In case of a submodule, check if it is up-to-date, otherwise set the flag CE_UPDATE, which will trigger an update of it in the phase updating the tree later. Signed-off

Re: [PATCHv2 4/5] unpack-trees: oneway_merge to update submodules

2018-01-02 Thread Stefan Beller
>> @@ -2139,6 +2139,9 @@ int oneway_merge(const struct cache_entry * const *src, >> ie_match_stat(o->src_index, old, , >> CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE)) >> update |= CE_UPD

Re: [PATCHv2 4/5] unpack-trees: oneway_merge to update submodules

2018-01-02 Thread Junio C Hamano
ie_match_stat(o->src_index, old, , > CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE)) > update |= CE_UPDATE; > } > + if (S_ISGITLINK(old->ce_mode) && should_update_submodule

[PATCHv2 4/5] unpack-trees: oneway_merge to update submodules

2017-12-27 Thread Stefan Beller
When there is a one way merge, each submodule needs to be one way merged as well, if we're asked to recurse into submodules. In case of a submodule, check if it is up-to-date, otherwise set the flag CE_UPDATE, which will trigger an update of it in the phase updating the tree later. Signed-off

Re: [PATCH 3/1] update-index doc: note a fixed bug in the untracked cache

2017-12-27 Thread Junio C Hamano
. > > Thanks a lot. I think it's probably good to apply something like this > on top of this now 3-patch series. Thanks both for working well together. Now that the problem turns out not about symbolic links, can we update the test in 1/1 not to depend on symbolic links? > > Docu

[PATCH 3/1] update-index doc: note a fixed bug in the untracked cache

2017-12-27 Thread Ævar Arnfjörð Bjarmason
alid flag). I don't know why >> but that's ok we'll roll with it. > > I figured this out. Which is good because now I know how/why the bug > happens. Thanks a lot. I think it's probably good to apply something like this on top of this now 3-patch series. Documentation/git-update-index.

Re: [PATCH] Re: Bug with "git submodule update" + subrepo with differing path/name?

2017-12-21 Thread Stefan Beller
On Thu, Dec 21, 2017 at 2:17 PM, Andreas Urke wrote: > Thanks for the detailed explanation. Although I am not too git savvy, > I believe I got the gist of it. > > Regarding your question, > I would say the term "name" in an IT context makes me primarily think > of something that

Re: [PATCH] Re: Bug with "git submodule update" + subrepo with differing path/name?

2017-12-21 Thread Stefan Beller
On Thu, Dec 21, 2017 at 2:08 PM, Junio C Hamano wrote: > That sounds like a bit of revisionist history, but you weren't around > back then, so... > > https://public-inbox.org/git/11793556371774-git-send-email-jun...@cox.net/#r > > is my summarization of discussions before that

Re: [PATCH] Re: Bug with "git submodule update" + subrepo with differing path/name?

2017-12-21 Thread Andreas Urke
ething strange/illegal. Can I ask you, now that I have made this mess, do you have any suggestion on how to rectify it or some other way to achieve my goal? The only side-effect I have seen is this update problem (been running this for a few months), but after your explanations I would like to ge

[PATCH v2 4/5] status: update short status to use --no-ahead-behind

2017-12-21 Thread Jeff Hostetler
From: Jeff Hostetler Teach "git status --short --branch" to use "--no-ahead-behind" flag to skip computing ahead/behind counts for the branch and its upstream and just report '[different]'. Signed-off-by: Jeff Hostetler ---

Re: [PATCH] Re: Bug with "git submodule update" + subrepo with differing path/name?

2017-12-21 Thread Stefan Beller
On Thu, Dec 21, 2017 at 8:21 AM, Andreas Urke wrote: > If I am entering into undefined behavior territory with the renaming > then there might not be any point to pursue this further, but in any > case, script below: > > Apologies up-front for the verbosity, there are probably a

Re: [PATCH 3/4] status: update short status to use --no-ahead-behind

2017-12-21 Thread Jeff Hostetler
On 12/21/2017 10:39 AM, Jeff King wrote: On Thu, Dec 21, 2017 at 09:18:17AM -0500, Jeff Hostetler wrote: This patch will affect "git status --porcelain", too. That's not supposed to change in incompatible ways. I guess it's up for debate whether callers are meant to handle any arbitrary

Re: [PATCH] Re: Bug with "git submodule update" + subrepo with differing path/name?

2017-12-21 Thread Andreas Urke
it this to superrepo cd sub1 touch third && git add . && git commit -m "third" cd ../sub2 touch third && git add . && git commit -m "third" cd .. git add . git commit -m "third" git checkout HEAD^ git status git submodule update git sta

Re: [PATCH 3/4] status: update short status to use --no-ahead-behind

2017-12-21 Thread Jeff King
On Thu, Dec 21, 2017 at 09:18:17AM -0500, Jeff Hostetler wrote: > > This patch will affect "git status --porcelain", too. That's not > > supposed to change in incompatible ways. I guess it's up for debate > > whether callers are meant to handle any arbitrary string inside the [] > > (we already

Re: [PATCH 3/4] status: update short status to use --no-ahead-behind

2017-12-21 Thread Jeff Hostetler
On 12/20/2017 11:26 AM, Jeff King wrote: On Wed, Dec 20, 2017 at 02:42:44PM +, Jeff Hostetler wrote: From: Jeff Hostetler Teach "git status --short --branch" to use "--no-ahead-behind" flag to skip computing ahead/behind counts for the branch and its upstream

[PATCH 1/1] git-p4: update multiple shelved change lists

2017-12-21 Thread Luke Diamand
--update-shelve can now be specified multiple times on the command-line, to update multiple shelved changelists in a single submit. This then means that a git patch series can be mirrored to a sequence of shelved changelists, and (relatively easily) kept in sync as changes are made in git. Note

[PATCH 0/1] git-p4: update multiple shelved change lists

2017-12-21 Thread Luke Diamand
This change lets you update several P4 changelists in sequence. Say you have several git commits which are all somehow related. You would start by shelving them (e.g. for a review), something like this: git p4 submit --origin HEAD^2 --shelve You then make changes to these commits (in git

Re: [PATCH 3/6] fsmonitor: Update helper tool, now that flags are filled later

2017-12-20 Thread Alex Vandiver
On Mon, 18 Dec 2017, Alex Vandiver wrote: > dd9005a0a ("fsmonitor: delay updating state until after split index is > merged", 2017-10-27) began deferring the setting of the > CE_FSMONITOR_VALID flag until later, such that do_read_index() does > not perform those steps. This means that

Re: [PATCH] Re: Bug with "git submodule update" + subrepo with differing path/name?

2017-12-20 Thread Stefan Beller
On Wed, Dec 20, 2017 at 12:22 AM, Andreas Urke wrote: > Thanks for looking into this. > > I was able to reproduce it from scratch, but I followed my earlier > workflow where I first created the subrepos, and then later renamed > it. At the time I was not able to find any command

Re: [PATCH 3/4] status: update short status to use --no-ahead-behind

2017-12-20 Thread Jeff King
On Wed, Dec 20, 2017 at 02:42:44PM +, Jeff Hostetler wrote: > From: Jeff Hostetler > > Teach "git status --short --branch" to use "--no-ahead-behind" > flag to skip computing ahead/behind counts for the branch and > its upstream and just report '[different]'. How

[PATCH 3/4] status: update short status to use --no-ahead-behind

2017-12-20 Thread Jeff Hostetler
From: Jeff Hostetler Teach "git status --short --branch" to use "--no-ahead-behind" flag to skip computing ahead/behind counts for the branch and its upstream and just report '[different]'. Signed-off-by: Jeff Hostetler ---

Re: [PATCH] Re: Bug with "git submodule update" + subrepo with differing path/name?

2017-12-20 Thread Andreas Urke
; in the superproject tree a submodule is bound to. > > I tried the same test on 2.15 and cannot reproduce there either. > >> >> 4b4acedd61 submodule: simplify decision tree whether to or not to fetch >> c68f837576 implement fetching of moved submodules >>

Re: [PATCH] Re: Bug with "git submodule update" + subrepo with differing path/name?

2017-12-19 Thread Stefan Beller
erproject tree a submodule is bound to. I tried the same test on 2.15 and cannot reproduce there either. > > 4b4acedd61 submodule: simplify decision tree whether to or not to fetch > c68f837576 implement fetching of moved submodules > 01ce12252c fetch: add test to make su

Re: [PATCH] Re: Bug with "git submodule update" + subrepo with differing path/name?

2017-12-19 Thread Junio C Hamano
c68f837576 implement fetching of moved submodules 01ce12252c fetch: add test to make sure we stay backwards compatible But IIRC, "submodule update" uses a separate codepath?

[PATCH] Re: Bug with "git submodule update" + subrepo with differing path/name?

2017-12-19 Thread Stefan Beller
index 6f083c4d68..d957305c38 100755 --- a/t/t7406-submodule-update.sh +++ b/t/t7406-submodule-update.sh @@ -978,4 +978,20 @@ test_expect_success 'git clone passes the parallel jobs config on to submodules' rm -rf super4 ' +test_expect_success 'git submodule update works with subm

Bug with "git submodule update" + subrepo with differing path/name?

2017-12-18 Thread Andreas Urke
Hi, I have a repo with two submodules. I regularly use "git submodule update", which works fine for one subrepo, but not for the other. The only relevant difference I can think of between these two subrepos is that the latter one does not have a matching path and name: $ cat .

[PATCH v5 3/9] Add a function to update HEAD after creating a commit

2017-12-11 Thread Phillip Wood
From: Phillip Wood Add update_head_with_reflog() based on the code that updates HEAD after committing in builtin/commit.c that can be called by 'git commit' and other commands. Signed-off-by: Phillip Wood --- Notes: changes since v2:

[PATCH v3 6/9] rebase -i: update functions to use a flags parameter

2017-12-05 Thread Liam Beguin
Update functions used in the rebase--helper so that they take a generic 'flags' parameter instead of a growing list of options. Signed-off-by: Liam Beguin <liambeg...@gmail.com> --- builtin/rebase--helper.c | 13 +++-- sequencer.c | 9 + seque

[PATCH v6 08/14] fixup: fetch: update --blob-max-bytes to --fitler

2017-12-05 Thread Jeff Hostetler
From: Jeff Hostetler Signed-off-by: Jeff Hostetler --- t/t5500-fetch-pack.sh | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh index 65fc7bb..ec9ba9b 100755 ---

[PATCH v6 07/14] fixup: fetch: update error messages from --blob-max-bytes to --filter

2017-12-05 Thread Jeff Hostetler
From: Jeff Hostetler Signed-off-by: Jeff Hostetler --- builtin/fetch.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/builtin/fetch.c b/builtin/fetch.c index 05d0b1a..14aab71 100644 --- a/builtin/fetch.c +++

RE: [PATCH v2 6/9] rebase -i: update functions to use a flags parameter

2017-12-05 Thread Kerry, Richard
---Original Message- > From: Junio C Hamano [mailto:gits...@pobox.com] > Sent: Tuesday, December 05, 2017 4:06 PM > To: Kerry, Richard <richard.ke...@atos.net> > Cc: git@vger.kernel.org; Johannes Schindelin > <johannes.schinde...@gmx.de>; p...@peff.net; liam Begui

Re: [PATCH v2 6/9] rebase -i: update functions to use a flags parameter

2017-12-05 Thread Junio C Hamano
"Kerry, Richard" writes: > "Shorted" is what happens when you put a piece of wire across the terminals > of a battery ... (bang, smoke, etc). > It's short for "short-circuited". Or it is what you do to something that you sell and that you yet do not own, expecting that

Re: [PATCH v2 6/9] rebase -i: update functions to use a flags parameter

2017-12-05 Thread liam Beguin
Hi, On 05/12/17 07:41 AM, Kerry, Richard wrote: > > "Shorted" is what happens when you put a piece of wire across the terminals > of a battery ... (bang, smoke, etc). > It's short for "short-circuited". > Yes, I think you mean "shortened" in this case. > Thanks for the explanation. Sorry, my

RE: [PATCH v2 6/9] rebase -i: update functions to use a flags parameter

2017-12-05 Thread Kerry, Richard
Junio C Hamano > Sent: Tuesday, December 05, 2017 12:37 PM > To: liam Beguin <liambeg...@gmail.com> > Cc: Johannes Schindelin <johannes.schinde...@gmx.de>; > git@vger.kernel.org; p...@peff.net > Subject: Re: [PATCH v2 6/9] rebase -i: update functions to use a flags > p

Re: [PATCH v2 6/9] rebase -i: update functions to use a flags parameter

2017-12-05 Thread Junio C Hamano
liam Beguin writes: > I'll change it to TODO_LIST_SHORTED_IDs. TODO_LIST_SHORTED_INSNS would > suggest the flag changes both parts of the todo. I am not a native speaker, but SHORTED does not sound like a right phrase. When you make something shorter, that thing is

Re: [PATCH v2 6/9] rebase -i: update functions to use a flags parameter

2017-12-04 Thread liam Beguin
Hi Johannes, On 04/12/17 10:46 AM, Johannes Schindelin wrote: > Hi Liam, > > On Sun, 3 Dec 2017, Liam Beguin wrote: > >> diff --git a/sequencer.h b/sequencer.h >> index 4e444e3bf1c4..3bb6b0658192 100644 >> --- a/sequencer.h >> +++ b/sequencer.h >> @@ -45,10 +45,12 @@ int

Re: [PATCH v2 6/9] rebase -i: update functions to use a flags parameter

2017-12-04 Thread Johannes Schindelin
Hi Liam, On Mon, 4 Dec 2017, Johannes Schindelin wrote: > On Sun, 3 Dec 2017, Liam Beguin wrote: > > > diff --git a/sequencer.h b/sequencer.h > > index 4e444e3bf1c4..3bb6b0658192 100644 > > --- a/sequencer.h > > +++ b/sequencer.h > > @@ -45,10 +45,12 @@ int sequencer_continue(struct replay_opts

Re: [PATCH v2 6/9] rebase -i: update functions to use a flags parameter

2017-12-04 Thread Johannes Schindelin
Hi Liam, On Sun, 3 Dec 2017, Liam Beguin wrote: > diff --git a/sequencer.h b/sequencer.h > index 4e444e3bf1c4..3bb6b0658192 100644 > --- a/sequencer.h > +++ b/sequencer.h > @@ -45,10 +45,12 @@ int sequencer_continue(struct replay_opts *opts); > int sequencer_rollback(struct replay_opts *opts);

[PATCH v2 6/9] rebase -i: update functions to use a flags parameter

2017-12-03 Thread Liam Beguin
Update functions used in the rebase--helper so that they take a generic 'flags' parameter instead of a growing list of options. Signed-off-by: Liam Beguin <liambeg...@gmail.com> --- builtin/rebase--helper.c | 13 +++-- sequencer.c | 9 + seque

Re: [PATCH] l10n: update de_DE translation

2017-12-02 Thread Ralf Thielow
Robert Abel wrote: > Der-, die- and dasselbe and their declensions are spelt as one word in German. > Thanks! > Signed-off-by: Robert Abel > --- > po/de.po | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/po/de.po

[PATCH] l10n: update de_DE translation

2017-12-01 Thread Robert Abel
Der-, die- and dasselbe and their declensions are spelt as one word in German. Signed-off-by: Robert Abel --- po/de.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/de.po b/po/de.po index a05aca5f3..400262625 100644 --- a/po/de.po +++

[PATCH v4 3/9] Add a function to update HEAD after creating a commit

2017-11-24 Thread Phillip Wood
From: Phillip Wood Add update_head_with_reflog() based on the code that updates HEAD after committing in builtin/commit.c that can be called by 'git commit' and other commands. Signed-off-by: Phillip Wood --- Notes: changes since v2:

[PATCH 5/6] grep: update boundary variable for pre-context

2017-11-18 Thread René Scharfe
Function context can be bigger than -A/-B/-C context. To find the beginning of the combined context we search backwards. Currently we check at each loop iteration what we're looking for and determine the effective upper boundary based on that. Simplify this a bit by setting the variable "from"

[PATCH 3/4] branch: update warning message shown when copying a misnamed branch

2017-11-18 Thread Kaartic Sivaraam
the misnamed branch. This is not correct and may confuse the user. So, update the warning message shown to be more precise that only a copy of the misnamed branch has been created. It's better to show the warning message than not showing it at all as it makes the user aware of the presence of a misnamed branch. Si

[PATCH v3 3/8] Add a function to update HEAD after creating a commit

2017-11-17 Thread Phillip Wood
From: Phillip Wood Add update_head_with_reflog() based on the code that updates HEAD after committing in builtin/commit.c that can be called by 'git commit' and other commands. Signed-off-by: Phillip Wood --- Notes: changes since v2:

[PATCH] apply: update line lengths for --inaccurate-eof

2017-11-16 Thread René Scharfe
the buffers for preimage and postimage. Before it does, it builds an array with the lengths of each line for both. Make sure to update the length of the last line in these line info structures as well to keep them consistent with their respective buffer. Without this fix the added test fails; git apply

Re: [PATCH v2 3/9] Add a function to update HEAD after creating a commit

2017-11-13 Thread Phillip Wood
On 10/11/17 18:36, Junio C Hamano wrote: > Phillip Wood writes: > >> From: Phillip Wood >> >> Add update_head() based on the code that updates HEAD after committing >> in builtin/commit.c that can be called by 'git commit' and other >>

Re: [PATCH v2 3/9] Add a function to update HEAD after creating a commit

2017-11-10 Thread Junio C Hamano
Phillip Wood writes: > From: Phillip Wood > > Add update_head() based on the code that updates HEAD after committing > in builtin/commit.c that can be called by 'git commit' and other > commands. > > Signed-off-by: Phillip Wood

[PATCH v2 3/9] Add a function to update HEAD after creating a commit

2017-11-10 Thread Phillip Wood
From: Phillip Wood Add update_head() based on the code that updates HEAD after committing in builtin/commit.c that can be called by 'git commit' and other commands. Signed-off-by: Phillip Wood --- Notes: changes since v1: -

[PATCH v1 2/4] update-index: add fastindex support to update-index

2017-11-09 Thread Ben Peart
Add support in update-index to manually add/remove the fastindex extension via --[no-]fastindex flags. Signed-off-by: Ben Peart <benpe...@microsoft.com> --- builtin/update-index.c | 22 ++ 1 file changed, 22 insertions(+) diff --git a/builtin/update-index.c b/builtin/

Re: [PATCH v1 2/8] Add a function to update HEAD after creating a commit

2017-11-07 Thread Phillip Wood
On 07/11/17 03:02, Johannes Schindelin wrote: > Hi Junio, > > On Tue, 7 Nov 2017, Junio C Hamano wrote: > >> Phillip Wood writes: >> >>> @@ -751,6 +751,42 @@ int template_untouched(const struct strbuf *sb, const >>> char *template_file, >>> return

Re: [PATCH v1 2/8] Add a function to update HEAD after creating a commit

2017-11-07 Thread Johannes Schindelin
Hi Junio, On Tue, 7 Nov 2017, Junio C Hamano wrote: > Phillip Wood writes: > > > @@ -751,6 +751,42 @@ int template_untouched(const struct strbuf *sb, const > > char *template_file, > > return rest_is_empty(sb, start - sb->buf); > > } > > > > +int

Re: [PATCH v1 2/8] Add a function to update HEAD after creating a commit

2017-11-06 Thread Junio C Hamano
Phillip Wood writes: > @@ -1735,25 +1733,10 @@ int cmd_commit(int argc, const char **argv, const > char *prefix) > strbuf_release(_ident); > free_commit_extra_headers(extra); > > - nl = strchr(sb.buf, '\n'); > - if (nl) > -

[PATCH v1 2/8] Add a function to update HEAD after creating a commit

2017-11-06 Thread Phillip Wood
From: Phillip Wood Add update_head() based on the code that updates HEAD after committing in builtin/commit.c that can be called by 'git commit' and other commands. Signed-off-by: Phillip Wood --- builtin/commit.c | 19

[PATCH v2 9/9] refs: update some more docs to use "oid" rather than "sha1"

2017-11-05 Thread Michael Haggerty
) @@ -2272,7 +2271,7 @@ static int split_symref_update(struct files_ref_store *refs, /* * Change the symbolic ref update to log only. Also, it -* doesn't need to check its old SHA-1 value, as that will be +* doesn't need to check its old OID value, as that will

Re: [RFC PATCH 2/8] commit: move code to update HEAD to libgit

2017-10-24 Thread Junio C Hamano
Phillip Wood writes: >> I suspect that it would be sufficient to make update_head() helper >> function take the reflog action message as another parameter >> instead to fix the above, but there may be other reasons why you >> chose to do it this way---I cannot read it

Re: [RFC PATCH 2/8] commit: move code to update HEAD to libgit

2017-10-24 Thread Phillip Wood
sted this series, I go though all the patches and fix them (this would be a good opportunity for me to try using git-clang-format from next) Thanks for looking at this, did you have time to look at the other changes in this series or did this patch put you off looking further? I'll update and repos

[PATCH v3 06/25] refs: update ref transactions to use struct object_id

2017-10-15 Thread brian m. carlson
Update the ref transaction code to use struct object_id. Remove one NULL pointer check which was previously inserted around a dereference; since we now pass a pointer to struct object_id directly through, the code we're calling handles this for us. Signed-off-by: brian m. carlson <s

Re: [PATCH v2 2/5] Update documentation for new directory and status logic

2017-10-12 Thread Junio C Hamano
Jameson Miller writes: >>> +If this is set, files and directories that explicity match an ignore >>> +pattern are reported. Implicity ignored directories (directories that >>> +do not match an ignore pattern, but whose contents are all ignored) >>> +are not reported,

Re: [PATCH v2 2/5] Update documentation for new directory and status logic

2017-10-12 Thread Jameson Miller
On 10/11/2017 10:55 PM, Junio C Hamano wrote: Jameson Miller writes: Signed-off-by: Jameson Miller --- Documentation/git-status.txt | 21 +- Documentation/technical/api-directory-listing.txt | 27

Re: [PATCH v2 2/5] Update documentation for new directory and status logic

2017-10-11 Thread Junio C Hamano
Jameson Miller writes: > Signed-off-by: Jameson Miller > --- > Documentation/git-status.txt | 21 +- > Documentation/technical/api-directory-listing.txt | 27 > +++ > 2 files changed, 43

[PATCH v2 2/5] Update documentation for new directory and status logic

2017-10-11 Thread Jameson Miller
Signed-off-by: Jameson Miller --- Documentation/git-status.txt | 21 +- Documentation/technical/api-directory-listing.txt | 27 +++ 2 files changed, 43 insertions(+), 5 deletions(-) diff --git

Re: [PATCH v2 05/24] refs: update ref transactions to use struct object_id

2017-10-11 Thread Michael Haggerty
On 10/09/2017 03:11 AM, brian m. carlson wrote: > Update the ref transaction code to use struct object_id. Remove one > NULL pointer check which was previously inserted around a dereference; > since we now pass a pointer to struct object_id directly through, the > code we're cal

Re: [PATCH v2 05/24] refs: update ref transactions to use struct object_id

2017-10-09 Thread Jonathan Nieder
brian m. carlson wrote: > Update the ref transaction code to use struct object_id. Remove one > NULL pointer check which was previously inserted around a dereference; > since we now pass a pointer to struct object_id directly through, the > code we're calling handles this for us. &g

Re: [PATCH v1 1/2] entry.c: update cache entry only for existing files

2017-10-09 Thread Jeff King
On Sun, Oct 08, 2017 at 11:37:14PM +0200, Lars Schneider wrote: > >> Yeah, I think that makes more sense. > >> > >> A patch may look like this on top of these two patches, but I'd > >> prefer to see Lars's eyeballing and possibly wrapping it up in an > >> applicable patch after taking the

[PATCH v2 05/24] refs: update ref transactions to use struct object_id

2017-10-08 Thread brian m. carlson
Update the ref transaction code to use struct object_id. Remove one NULL pointer check which was previously inserted around a dereference; since we now pass a pointer to struct object_id directly through, the code we're calling handles this for us. Signed-off-by: brian m. carlson <s

Re: [PATCH v1 1/2] entry.c: update cache entry only for existing files

2017-10-08 Thread Lars Schneider
> On 06 Oct 2017, at 06:54, Jeff King wrote: > > On Fri, Oct 06, 2017 at 08:01:48AM +0900, Junio C Hamano wrote: > >>> But >>> I think we'd want to protect the read_blob_entry() call at the top of >>> the case with a check for dco->state == CE_RETRY. >> >> Yeah, I think that

Re: [RFC PATCH 2/8] commit: move code to update HEAD to libgit

2017-10-07 Thread Junio C Hamano
Phillip Wood writes: > From: Phillip Wood > > Signed-off-by: Phillip Wood > --- This seems to do a lot more than just moving code, most notably, it uses setenv() to affect what happens in any subprocesses we

Re: [PATCH v1 1/2] entry.c: update cache entry only for existing files

2017-10-05 Thread Jeff King
On Fri, Oct 06, 2017 at 08:01:48AM +0900, Junio C Hamano wrote: > > But > > I think we'd want to protect the read_blob_entry() call at the top of > > the case with a check for dco->state == CE_RETRY. > > Yeah, I think that makes more sense. > > A patch may look like this on top of these two

Re: [PATCH] api-argv-array.txt: Update link to string-list API

2017-10-05 Thread Junio C Hamano
Todd Zullinger writes: > I noticed this broken link in the html documentation while building > 2.15.0-rc0. I'm not sure whether it's better to point the link to the > string-list.h file on Git Hub, remove the link, or drop the entire > paragraph. Probably removing the link is

Re: [PATCH v1 1/2] entry.c: update cache entry only for existing files

2017-10-05 Thread Junio C Hamano
Jeff King writes: > On Thu, Oct 05, 2017 at 08:19:13PM +0900, Junio C Hamano wrote: > >> This is unrelated to the main topic of this patch, but we see this >> just before the precontext of this hunk: >> >> if (dco && dco->state != CE_NO_DELAY) { >>

Re: [PATCH 2/6] Update documentation for new directory and status logic

2017-10-05 Thread Stefan Beller
On Thu, Oct 5, 2017 at 1:54 PM, wrote: > From: Jameson Miller > > Signed-off-by: Jameson Miller > --- > Documentation/git-status.txt | 22 +- >

[PATCH] api-argv-array.txt: Update link to string-list API

2017-10-05 Thread Todd Zullinger
In 4f665f2cf3 (string-list.h: move documentation from Documentation/api/ into header, 2017-09-26) the string-list API documentation was moved into string-list.h. Fix the link from the argv-array API documentation. Signed-off-by: Todd Zullinger --- Hi, I noticed this broken

[PATCH 2/6] Update documentation for new directory and status logic

2017-10-05 Thread jameson . miller81
From: Jameson Miller Signed-off-by: Jameson Miller --- Documentation/git-status.txt | 22 +- Documentation/technical/api-directory-listing.txt | 28 +++ 2 files changed, 45 insertions(+), 5

Re: [PATCH v1 1/2] entry.c: update cache entry only for existing files

2017-10-05 Thread Jeff King
On Thu, Oct 05, 2017 at 08:19:13PM +0900, Junio C Hamano wrote: > > diff --git a/entry.c b/entry.c > > index 1c7e3c11d5..5dab656364 100644 > > --- a/entry.c > > +++ b/entry.c > > @@ -304,7 +304,7 @@ static int write_entry(struct cache_entry *ce, > > ce->name,

Re: [PATCH v1 1/2] entry.c: update cache entry only for existing files

2017-10-05 Thread Junio C Hamano
lars.schnei...@autodesk.com writes: > diff --git a/entry.c b/entry.c > index 1c7e3c11d5..5dab656364 100644 > --- a/entry.c > +++ b/entry.c > @@ -304,7 +304,7 @@ static int write_entry(struct cache_entry *ce, > ce->name, new, size, , dco); >

Re: [PATCH v1 1/2] entry.c: update cache entry only for existing files

2017-10-05 Thread Jeff King
On Thu, Oct 05, 2017 at 12:44:06PM +0200, lars.schnei...@autodesk.com wrote: > From: Lars Schneider > > In 2841e8f ("convert: add "status=delayed" to filter process protocol", > 2017-06-30) we taught the filter process protocol to delay responses. > > That means an

[PATCH v1 1/2] entry.c: update cache entry only for existing files

2017-10-05 Thread lars . schneider
From: Lars Schneider In 2841e8f ("convert: add "status=delayed" to filter process protocol", 2017-06-30) we taught the filter process protocol to delay responses. That means an external filter might answer in the first write_entry() call on a file that requires

Re: [PATCH v2] setup: update error message to be more meaningful

2017-10-04 Thread Kaartic Sivaraam
On Tue, 2017-10-03 at 09:32 +0900, Junio C Hamano wrote: > > As an aside, I wonder if we want to _() the message. It's outside > the scope of this fix, obviously. > I'm surprised it isn't already! I think it should. As an aside, I wanted to know whether we should add 'test_expect_failure's

Re: [PATCH v2] setup: update error message to be more meaningful

2017-10-02 Thread Junio C Hamano
Kaartic Sivaraam writes: > Incorrect case, > > $ git grep "some random regex" -n > fatal: bad flag '-n' used after filename > > The above case is incorrect as "some random regex" isn't a filename > in this case. The command line rule is to have dashed

[PATCH v2] setup: update error message to be more meaningful

2017-10-02 Thread Kaartic Sivaraam
From: Kaartic Sivaraam The error message shown when a flag is found when expecting a filename wasn't clear as it didn't communicate what was wrong using the 'suitable' words in *all* cases. $ git ls-files README.md test-file Correct case,

[PATCH 05/24] refs: update ref transactions to use struct object_id

2017-10-01 Thread brian m. carlson
Update the ref transaction code to use struct object_id. Remove one NULL pointer check which was previously inserted around a dereference; since we now pass a pointer to struct object_id directly through, the code we're calling handles this for us. Signed-off-by: brian m. carlson <s

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