Re: Is there a way to have a local version of a header file?

On Sat, 18 Mar 2017, Junio C Hamano wrote: David Lang writes: Ship a config.h.sample file, have a Makefile rule that is forced to run before any compilation happens that checks if config.h exists and then created it if missing by copying config.h.sample over, and then all

Re: [PATCH 1/8] tag: Remove a TODO item from the test suite

W dniu 18.03.2017 o 11:32, Ævar Arnfjörð Bjarmason pisze: > @@ -136,7 +135,6 @@ test_expect_success \ > 'listing a tag using a matching pattern should output that tag' \ > 'test $(git tag -l mytag) = mytag' > > -# todo: git tag -l now returns always zero, when fixed, change this

Is there a way to have a local version of a header file?

for an embedded project built inside the Arduino IDE, (alternate firmware for a home automation project) there is a need to set a number of parameters that we really don't want in the main repo (wifi network IDs/passwords) right now, we have these things set as #defines in a header file. We

Re: Is there a way to have a local version of a header file?

On Sat, Mar 18, 2017 at 3:29 PM, David Lang wrote: > for an embedded project built inside the Arduino IDE, (alternate firmware > for a home automation project) there is a need to set a number of parameters > that we really don't want in the main repo (wifi network IDs/passwords) >

Re: Is there a way to have a local version of a header file?

On Sat, 18 Mar 2017, Ævar Arnfjörð Bjarmason wrote: On Sat, Mar 18, 2017 at 3:29 PM, David Lang wrote: for an embedded project built inside the Arduino IDE, (alternate firmware for a home automation project) there is a need to set a number of parameters that we really don't

[PATCH] pickaxe: fix segfault with '-S<...> --pickaxe-regex'

'git {log,diff,...} -S<...> --pickaxe-regex' can segfault as a result of out-of-bounds memory reads. diffcore-pickaxe.c:contains() looks for all matches of the given regex in a buffer in a loop, advancing the buffer pointer to the end of the last match in each iteration. When we switched to

Re: Commiting files larger than 4 GB on Windows

> 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

Re: [PATCH v3 1/4] environment.c: fix potential segfault by get_git_common_dir()

Nguyễn Thái Ngọc Duy writes: > setup_git_env() must be called before this function to initialize > git_common_dir so that it returns a non NULL string. And it must return > a non NULL string or segfault can happen because all callers expect so. > > Normally if somebody has

Re: [PATCH v2 12/12] rev-list: expose and document --single-worktree

Nguyễn Thái Ngọc Duy writes: > --- Missing sign-off. > Documentation/rev-list-options.txt | 8 > revision.c | 2 ++ > 2 files changed, 10 insertions(+) > > diff --git a/Documentation/rev-list-options.txt >

[PATCH 2/2] doc/SubmittingPatches: show how to get a CLI commit summary

Amend the section which describes how to get a commit summary to show how do to that with "git show", currently the documentation only shows how to do that with gitk. Signed-off-by: Ævar Arnfjörð Bjarmason --- Documentation/SubmittingPatches | 11 ++- 1 file changed,

Re: [BUG] "git stash -- path" reports wrong unstaged changes

On 03/17, Jeff King wrote: > I used "git stash -- path" for the first time today and happened to > notice an oddity. If I run: > > git init -q repo > cd repo > > for i in one two; do > echo content >$i > git add $i > done > git

[PATCH 0/2] doc/SubmittingPatches: A couple of minor improvements

On Sat, Mar 18, 2017 at 7:14 PM, Junio C Hamano wrote: > I'll retitle s/Remove/remove/ so that "git shortlog --no-merges" > would look more consistent, though. I already found a few grammar / phrasing issues with the commit messages, so I'll just change this on my side for a

[PATCH 1/2] doc/SubmittingPatches: clarify the casing convention for "area: change..."

Amend the section which describes how the first line of the subject should look like to say that the ":" in "area: " shouldn't be treated like a full stop for the purposes of letter casing. Change the two subject examples to make this new paragraph clearer, i.e. "unstar" is not a common word, and

How do I make 'git diff --no-index' follow symlinks?

I'd like to (ab)use git's nice diff interface and make this work: git --no-pager diff --no-index <(echo foo) <(echo bar) It just prints: -pipe:[203030063] +pipe:[203030065] But I want: $ diff -u0 <(echo foo) <(echo bar)|tail -n 2 -foo +bar I went diving through the

Re: How do I make 'git diff --no-index' follow symlinks?

Sounds like https://public-inbox.org/git/2016201958.2175-1-den...@kaarsemaker.net/ to me. A key message in the thread may be: https://public-inbox.org/git/alpine.DEB.2.20.1611121106110.3746@virtualbox/

[PATCH 04/20] builtin/diff: convert to struct object_id

Signed-off-by: brian m. carlson --- builtin/diff.c | 34 +- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/builtin/diff.c b/builtin/diff.c index 3d64b85337..398eee00d5 100644 --- a/builtin/diff.c +++ b/builtin/diff.c

[PATCH 06/20] builtin/receive-pack: convert portions to struct object_id

Convert some hardcoded constants into uses of parse_oid_hex. Additionally, convert all uses of struct command, and miscellaneous other functions necessary for that. This work is necessary to be able to convert sha1_array_append later on. Signed-off-by: brian m. carlson

Re: Is there a way to have a local version of a header file?

David Lang writes: >> Ship a config.h.sample file, have a Makefile rule that is forced to >> run before any compilation happens that checks if config.h exists >> and then created it if missing by copying config.h.sample over, and >> then all other source files can include config.h

Re: Is there a way to have a local version of a header file?

Arduino is basically a simplified/streamlined cross-compilation toolchain with very tightly coupled IDE integration. I'd just provide a .sample and tell people what to do with it in the README. The alternative is to provide config.h as is and tell people to use "git update-index

Re: [PATCH] receive-pack: simplify run_update_post_hook()

Jeff King writes: > On Fri, Mar 17, 2017 at 11:02:13PM +0100, René Scharfe wrote: > >> Instead of counting the arguments to see if there are any and then >> building the full command use a single loop and add the hook command >> just before the first argument. This reduces

Re: GSoC 2017: application open, deadline = February 9, 2017

Duy Nguyen writes: > Probably too late for GSoc 2017, but another idea for microproject (or > microprojects) is make use of dir-iterator.h more. For recursive > directory walking, this would make the code easier to read and > potentially avoid too deep recursion. There are

Re: [PATCH 2/8] tag: Refactor the options handling code to be less bizarro

Ævar Arnfjörð Bjarmason writes: > diff --git a/builtin/tag.c b/builtin/tag.c > index ad29be6923..0bba3fd070 100644 > --- a/builtin/tag.c > +++ b/builtin/tag.c > @@ -454,10 +454,10 @@ int cmd_tag(int argc, const char **argv, const char > *prefix) > } >

Re: [PATCH 1/2] doc/SubmittingPatches: clarify the casing convention for "area: change..."

Ævar Arnfjörð Bjarmason writes: > prefix the first line with "area: " where the area is a filename or > identifier for the general area of the code being modified, e.g. > > - . archive: ustar header checksum is computed unsigned > - . git-cherry-pick.txt: clarify the use

Re: [PATCH 8/8] tag: Change --point-at to default to HEAD

On Sat, Mar 18, 2017 at 7:54 PM, Junio C Hamano wrote: > Ævar Arnfjörð Bjarmason writes: > >> Change the --points-at option to default to HEAD for consistency with >> its siblings --contains, --merged etc. which default to HEAD. This >> changes behavior

Re: [PATCH] Inconsistency between git log and git rev-parse for ^HEAD^@

Andreas Gruenbacher writes: > Hello, > > the log and rev-parse commands both support the rev^@ syntax which stands for > all parents of rev. The log command also supports ^rev^@ to exclude all of > the > parents of rev, but rev-parse does not. Should this be fixed? > > If

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

Stefan Beller writes: >> Unfortunately gitglossary(7) doesn't make this clear at all --- it >> uses the term worktree a few times (and appears to mean "working tree" >> when it does --- e.g. >> >> Pathspecs are used on the command line of [...] and many other >>

Cash Donation

£1.5 Million Has Been Granted To You As A Donation Visit www.bbc.co.uk/news/uk-england-19254228 Sendname Address Phone for more info

Re: [PATCH 1/8] tag: Remove a TODO item from the test suite

Ævar Arnfjörð Bjarmason writes: > Change the test for "git tag -l" to not have an associated TODO > comment saying that it should return non-zero if there's no tags. > > This was added in commit ef5a6fb597 ("Add test-script for git-tag", > 2007-06-28) when the tests for "tag"

Re: Is there a way to have a local version of a header file?

W dniu 18.03.2017 o 18:08, Ævar Arnfjörð Bjarmason pisze: > There might be some way I haven't thought of, in particular maybe you > can use gitattributes to define a custom diff/merge driver that always > reports no changes, or some ways to (ab)use the index to make git > ignore any changes to

Re: [PATCH 2/8] tag: Refactor the options handling code to be less bizarro

On Sat, Mar 18, 2017 at 7:35 PM, Junio C Hamano wrote: > Ævar Arnfjörð Bjarmason writes: > >> diff --git a/builtin/tag.c b/builtin/tag.c >> index ad29be6923..0bba3fd070 100644 >> --- a/builtin/tag.c >> +++ b/builtin/tag.c >> @@ -454,10 +454,10 @@ int

Re: Shared repositories no longer securable against privilege escalation

W dniu 17.03.2017 o 18:12, Joe Rayhawk pisze: > Quoting Michael Haggerty (2017-03-17 05:07:36) >> >> Thanks for the report. This is indeed a problem for people who want to >> set restrictive privileges on $GIT_DIR. I'd never thought of that use >> case, but it makes sense. Is this practice

[PATCH v3 1/2] diff --no-index: optionally follow symlinks

Git's diff machinery does not follow symlinks, which makes sense as git itself also does not, but stores the symlink destination. In --no-index mode however, it is useful for diff to be able to follow symlinks, matching the behaviour of ordinary diff. A new --dereference (name copied from diff)

[PATCH] rev-parse: match @{u}, @{push} and ^{} case-insensitively

Change the revision parsing logic to match @{upstream}, @{u}, @{push}, ^{commit}, ^{tree} etc. case-insensitively. All of these cases currently emit "unknown revision or path not in the working tree" errors. This change makes them equivalent to their lower-case versions, and consistent with other

Re: [PATCH] tests: create an interactive gdb session with the 'debug' helper

On Fri, Mar 17, 2017 at 3:55 PM, Jeff King wrote: > On Fri, Mar 17, 2017 at 03:46:46PM +0100, SZEDER Gábor wrote: > >> The 'debug' test helper is supposed to facilitate debugging by running >> a command of the test suite under gdb. Unfortunately, its usefulness >> is severely

[PATCHv2 2/2] tests: make the 'test_pause' helper work in non-verbose mode

When the 'test_pause' helper function invokes the shell mid-test, it explicitly redirects the shell's stdout and stderr to file descriptors 3 and 4, which are the stdout and stderr of the tests (i.e. where they would be connected anyway without those redirections). These file descriptors are only

Re: Is there a way to have a local version of a header file?

On Sat, Mar 18, 2017 at 3:58 PM, David Lang wrote: > On Sat, 18 Mar 2017, Ævar Arnfjörð Bjarmason wrote: > >> On Sat, Mar 18, 2017 at 3:29 PM, David Lang wrote: >>> >>> for an embedded project built inside the Arduino IDE, (alternate firmware >>> for a home

[PATCH 14/20] sha1-array: convert internal storage for struct sha1_array to object_id

Make the internal storage for struct sha1_array use an array of struct object_id internally. Update the users of this struct which inspect its internals. Signed-off-by: brian m. carlson --- bisect.c | 14 +++--- builtin/pull.c | 22

[PATCH 13/20] builtin/pull: convert to struct object_id

Convert virtually all uses of unsigned char [20] to struct object_id. Leave all the arguments that come from struct sha1_array, as these will be converted in a later patch. Signed-off-by: brian m. carlson --- builtin/pull.c | 72

Re: [PATCH v2 1/2] l10n: Introduce framework for localizing man pages

Junio C Hamano writes: > Jean-Noel Avila writes: > >> Providing git in localized version is a good step for general adoption >> of the tool. But as of now, if one needs to refer to the manual pages, >> they are still confronted to english. The aim is to

[PATCHv2 1/2] tests: create an interactive gdb session with the 'debug' helper

The 'debug' test helper is supposed to facilitate debugging by running a command of the test suite under gdb. Unfortunately, its usefulness is severely limited, because that gdb session is not interactive, since the test's, and thus gdb's standard input is redirected from /dev/null (for a good

Re: [PATCH v3 0/4] Kill manual ref parsing code in worktree.c

Nguyễn Thái Ngọc Duy writes: > v3 is a rebased version on latest nd/files-backend-git-dir [1]. Since > that series added a bunch of new refs_* functions, v2's 02/05 and > 04/05 are removed. The new 01/04 could be an indepedent fix, but at > test-ref-store.c requires it, so I

[PATCHv2] pickaxe: fix segfault with '-S<...> --pickaxe-regex'

'git {log,diff,...} -S<...> --pickaxe-regex' can segfault as a result of out-of-bounds memory reads. diffcore-pickaxe.c:contains() looks for all matches of the given regex in a buffer in a loop, advancing the buffer pointer to the end of the last match in each iteration. When we switched to

Re: [PATCH 2/8] tag: Refactor the options handling code to be less bizarro

Ævar Arnfjörð Bjarmason writes: > But I thought it was very a very bizarre pattern to set us to cmdmode > = 'l' when we're not in that mode at all just to, as can be seen in > the diff, get around a slightly more verbose one-time if-check. When I wrote my response, I viewed

Re: [PATCH 3/8] tag: Change misleading --list documentation

On Sat, Mar 18, 2017 at 7:43 PM, Junio C Hamano wrote: > Ævar Arnfjörð Bjarmason writes: > >> However, documenting this as "-l " was never correct, as >> these both worked before Jeff's change: >> >> git tag -l 'v*' >> git tag 'v*' -l > > Actually,

[PATCH] Inconsistency between git log and git rev-parse for ^HEAD^@

Hello, the log and rev-parse commands both support the rev^@ syntax which stands for all parents of rev. The log command also supports ^rev^@ to exclude all of the parents of rev, but rev-parse does not. Should this be fixed? If so, the following patch would be a start. Thanks, Andreas --

[PATCH v3 0/2] diff --no-index: support symlinks and pipes

git diff <(command1) <(command2) is less useful than it could be, all it outputs is: diff --git a/dev/fd/63 b/dev/fd/62 index 9e6542b297..9f7b2c291b 12 --- a/dev/fd/63 +++ b/dev/fd/62 @@ -1 +1 @@ -pipe:[464811685] \ No newline at end of file +pipe:[464811687] \ No newline at end of file

Re: [PATCH] Inconsistency between git log and git rev-parse for ^HEAD^@

On Sat, Mar 18, 2017 at 9:18 PM, Junio C Hamano wrote: > Andreas Gruenbacher writes: > >> Hello, >> >> the log and rev-parse commands both support the rev^@ syntax which stands for >> all parents of rev. The log command also supports ^rev^@ to exclude all

[PATCH v3 2/2] diff --no-index: support reading from pipes

diff <(command1) <(command2) provides useful output, let's make it possible for git to do the same. Signed-off-by: Dennis Kaarsemaker --- diff-no-index.c | 9 + diff.c | 18 -- t/t4053-diff-no-index.sh | 10 ++

Re: Is there a way to have a local version of a header file?

On Sat, 18 Mar 2017, Junio C Hamano wrote: Ævar Arnfjörð Bjarmason writes: There might be some way I haven't thought of, in particular maybe you can use gitattributes to define a custom diff/merge driver that always reports no changes, or some ways to (ab)use the index to

[PATCH v2 2/2] l10n: Add git-add.txt to localized man pages

Signed-off-by: Jean-Noel Avila --- Documentation/po/documentation.fr.po | 1095 ++ Documentation/po/documentation.pot | 787 2 files changed, 1882 insertions(+) create mode 100644 Documentation/po/documentation.fr.po

[PATCH v2 1/2] l10n: Introduce framework for localizing man pages

Providing git in localized version is a good step for general adoption of the tool. But as of now, if one needs to refer to the manual pages, they are still confronted to english. The aim is to provide documentation to users in their own language. signed-off-by: Jean-Noel Avila

Re: [PATCH v2 1/2] l10n: Introduce framework for localizing man pages

Jean-Noel Avila writes: > Providing git in localized version is a good step for general adoption > of the tool. But as of now, if one needs to refer to the manual pages, > they are still confronted to english. The aim is to provide > documentation to users in their own

Re: [PATCH 2/8] tag: Refactor the options handling code to be less bizarro

On Sat, Mar 18, 2017 at 8:27 PM, Junio C Hamano wrote: > Ævar Arnfjörð Bjarmason writes: > >> But I thought it was very a very bizarre pattern to set us to cmdmode >> = 'l' when we're not in that mode at all just to, as can be seen in >> the diff, get around

Re: [PATCH v2 1/2] l10n: Introduce framework for localizing man pages

Le samedi 18 mars 2017, 12:41:22 CET Junio C Hamano a écrit : > Jean-Noel Avila writes: > > Providing git in localized version is a good step for general adoption > > of the tool. But as of now, if one needs to refer to the manual pages, > > they are still confronted to english.

Respond to me immediately!!

Dear how are you, First I got your contact from yahoo Terrors search, when am searching for a foreigner, please I don’t now if you can keep secret? A word of your own as a human-being? As I have gone through your profile. Well I have a deal worth 5.5m$ from the dormant account in

Re: [PATCH v5 00/10] decoupling url and submodule interest

Brandon Williams writes: > Changes in v5: > * Add "NEEDSWORK" comments to indicate where attention is needed once > per-worktree config is a reality > * --no-recurse now works by clearing the string list of paths. > * module_list_active() now does post-processing

Re: [PATCH] pickaxe: fix segfault with '-S<...> --pickaxe-regex'

On Sat, Mar 18, 2017 at 4:12 PM, SZEDER Gábor wrote: > Make sure that the buffer size is reduced on each iteration as the > buffer pointer is advanced, thus maintaining the correct end of buffer > location. > > The new test is flaky, I've never seen it fail on my Linux box,

Re: [PATCH 3/8] tag: Change misleading --list documentation

Ævar Arnfjörð Bjarmason writes: > However, documenting this as "-l " was never correct, as > these both worked before Jeff's change: > > git tag -l 'v*' > git tag 'v*' -l Actually, we do not particularly care about the latter, and quite honestly, I'd prefer we do not

Re: [PATCH 8/8] tag: Change --point-at to default to HEAD

Ævar Arnfjörð Bjarmason writes: > Change the --points-at option to default to HEAD for consistency with > its siblings --contains, --merged etc. which default to HEAD. This > changes behavior added in commit ae7706b9ac (tag: add --points-at list > option, 2012-02-08). Makes a

Re: [PATCH] pickaxe: fix segfault with '-S<...> --pickaxe-regex'

Interestingly, the new test fails (with the patch) under prove but not when run from the shell (i.e. "cd t && sh t4062-diff-pickaxe.sh").

Re: [PATCH 1/2] doc/SubmittingPatches: clarify the casing convention for "area: change..."

Ævar Arnfjörð Bjarmason writes: > ...it makes this subsequent example more succinct and clear, because > e.g. "githooks.txt" is shorter than "git-cherry-pick.txt", and > "clarify" is obviously a normal looking word... Ah, that makes sense. Thanks.

Re: Shared repositories no longer securable against privilege escalation

On Fri, Mar 17, 2017 at 1:23 AM, Joe Rayhawk wrote: > Git has started requiring write access to the root of bare repositories > in order to create /HEAD.lock. This is a major security problem in > shared environments as it also entails control over the /config link >

[PATCH 02/20] Convert GIT_SHA1_HEXSZ used for allocation to GIT_MAX_HEXSZ

Since we will likely be introducing a new hash function at some point, and that hash function might be longer than 40 hex characters, use the constant GIT_MAX_HEXSZ, which is designed to be suitable for allocations, instead of GIT_SHA1_HEXSZ. This will ease the transition down the line by

[PATCH 10/20] sha1_name: convert struct disambiguate_state to object_id

Convert struct disambiguate_state to use struct object_id by changing the structure definition and applying the following semantic patch: @@ struct disambiguate_state E1; @@ - E1.bin_pfx + E1.bin_pfx.hash @@ struct disambiguate_state *E1; @@ - E1->bin_pfx + E1->bin_pfx.hash @@ struct

[PATCH 03/20] Convert GIT_SHA1_RAWSZ used for allocation to GIT_MAX_RAWSZ

Since we will likely be introducing a new hash function at some point, and that hash function might be longer than 20 bytes, use the constant GIT_MAX_RAWSZ, which is designed to be suitable for allocations, instead of GIT_SHA1_RAWSZ. This will ease the transition down the line by distinguishing

[PATCH 07/20] fsck: convert init_skiplist to struct object_id

Convert a hardcoded constant buffer size to a use of GIT_MAX_HEXSZ, and use parse_oid_hex to reduce the dependency on the size of the hash. This function is a caller of sha1_array_append, which will be converted later. Signed-off-by: brian m. carlson --- fsck.c |

[PATCH 08/20] parse-options-cb: convert sha1_array_append caller to struct object_id

Signed-off-by: brian m. carlson --- parse-options-cb.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/parse-options-cb.c b/parse-options-cb.c index b7d8f7dcb2..40ece4d8c2 100644 --- a/parse-options-cb.c +++ b/parse-options-cb.c @@ -96,7

[PATCH 00/20] object_id part 7

This is part 7 in the continuing transition to use struct object_id. This series focuses on two main areas: adding two constants for the maximum hash size we'll be using (which will be suitable for allocating memory) and converting struct sha1_array to struct oid_array. The rationale for adding

[PATCH] send-email: Net::SMTP::SSL is obsolete, use only when necessary

Net::SMTP itself can do the necessary SSL and STARTTLS bits just fine since version 1.28, and Net::SMTP::SSL is now deprecated. Since 1.28 isn't that old yet, keep the old code in place and use it when necessary. Signed-off-by: Dennis Kaarsemaker --- Note: I've only been

Re: [PATCH] send-email: Net::SMTP::SSL is obsolete, use only when necessary

On Sat, Mar 18, 2017 at 11:23 PM, Dennis Kaarsemaker wrote: > Net::SMTP itself can do the necessary SSL and STARTTLS bits just fine > since version 1.28, and Net::SMTP::SSL is now deprecated. Since 1.28 > isn't that old yet, keep the old code in place and use it when >

[PATCH 01/20] Define new hash-size constants for allocating memory

Since we will want to transition to a new hash at some point in the future, and that hash may be larger in size than 160 bits, introduce two constants that can be used for allocating a sufficient amount of memory. They can be increased to reflect the largest supported hash size. Signed-off-by:

[PATCH 11/20] sha1_name: convert disambiguate_hint_fn to take object_id

Convert this function pointer type and the functions that implement it to take a struct object_id. Introduce a temporary in show_ambiguous_object to avoid having to convert for_each_abbrev at this point. Signed-off-by: brian m. carlson --- sha1_name.c | 64

[PATCH 09/20] test-sha1-array: convert most code to struct object_id

This helper is very small, so convert the entire thing. Signed-off-by: brian m. carlson --- t/helper/test-sha1-array.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/t/helper/test-sha1-array.c b/t/helper/test-sha1-array.c index

Re: [PATCH] send-email: Net::SMTP::SSL is obsolete, use only when necessary

On Sat, 2017-03-18 at 23:47 +0100, Ævar Arnfjörð Bjarmason wrote: > On Sat, Mar 18, 2017 at 11:23 PM, Dennis Kaarsemaker > wrote: > > > + require Net::SMTP; > > + my $use_net_smtp_ssl = $Net::SMTP::VERSION lt "1.28"; > > +

[PATCH 12/20] submodule: convert check_for_new_submodule_commits to object_id

All of the callers of this function have been converted, so convert this function and update the callers. This function also calls sha1_array_append, which we'll convert shortly. Signed-off-by: brian m. carlson --- builtin/fetch.c | 6 +++--- submodule.c | 4

[PATCH 05/20] builtin/pull: convert portions to struct object_id

Convert the caller of sha1_array_append to struct object_id. Signed-off-by: brian m. carlson --- builtin/pull.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/builtin/pull.c b/builtin/pull.c index 3ecb881b0b..a9f7553f30 100644 ---

Re: Is there a way to have a local version of a header file?

Ævar Arnfjörð Bjarmason writes: > There might be some way I haven't thought of, in particular maybe you > can use gitattributes to define a custom diff/merge driver that always > reports no changes, or some ways to (ab)use the index to make git > ignore any changes to the file.

Re: [PATCH 2/2] doc/SubmittingPatches: show how to get a CLI commit summary

Ævar Arnfjörð Bjarmason writes: > The "Copy commit summary" command of gitk can be used to obtain this > -format. > +format, or this invocation of "git show": > > +git show -s --date=format:%Y-%m-%d --pretty='commit %h ("%s", %ad)' > I've seen (I think I stole it

Re: [PATCH] pickaxe: fix segfault with '-S<...> --pickaxe-regex'

Junio C Hamano writes: > Interestingly, the new test fails (with the patch) under prove but > not when run from the shell (i.e. "cd t && sh t4062-diff-pickaxe.sh"). Sorry, false alarm.

Re: [PATCH 1/2] doc/SubmittingPatches: clarify the casing convention for "area: change..."

On Sat, Mar 18, 2017 at 8:04 PM, Junio C Hamano wrote: > Ævar Arnfjörð Bjarmason writes: > >> prefix the first line with "area: " where the area is a filename or >> identifier for the general area of the code being modified, e.g. >> >> - . archive: ustar

[PATCH 16/20] Convert remaining callers of sha1_array_lookup to object_id

There are a very small number of callers which don't already use struct object_id. Convert them. Signed-off-by: brian m. carlson --- bisect.c | 14 +++--- builtin/pack-objects.c | 16 ref-filter.c | 22

[PATCH 18/20] Convert sha1_array_for_each_unique and for_each_abbrev to object_id

Make sha1_array_for_each_unique take a callback using struct object_id. Since one of these callbacks is an argument to for_each_abbrev, convert those as well. Rename various functions, replacing "sha1" with "oid". Signed-off-by: brian m. carlson ---

[PATCH 19/20] Rename sha1_array to oid_array

Since this structure handles an array of object IDs, rename it to struct oid_array. Also rename the accessor functions and the initialization constant. This commit was produced mechanically by providing non-Documentation files to the following Perl one-liners: perl -pi -E 's/struct

[PATCH 17/20] Convert sha1_array_lookup to take struct object_id

Convert this function by changing the declaration and definition and applying the following semantic patch to update the callers: @@ expression E1, E2; @@ - sha1_array_lookup(E1, E2.hash) + sha1_array_lookup(E1, ) @@ expression E1, E2; @@ - sha1_array_lookup(E1, E2->hash) + sha1_array_lookup(E1,

[PATCH 20/20] Documentation: update and rename api-sha1-array.txt

Since the structure and functions have changed names, update the code examples and the documentation. Rename the file to match the new name of the API. Signed-off-by: brian m. carlson --- .../{api-sha1-array.txt => api-oid-array.txt} | 44

[PATCH 15/20] Make sha1_array_append take a struct object_id *

Convert the callers to pass struct object_id by changing the function declaration and definition and applying the following semantic patch: @@ expression E1, E2, E3; @@ - sha1_array_append(E1, E2[E3].hash) + sha1_array_append(E1, E2 + E3) @@ expression E1, E2; @@ - sha1_array_append(E1, E2.hash)

Re: How do I make 'git diff --no-index' follow symlinks?

On Sat, 2017-03-18 at 12:30 -0700, Junio C Hamano wrote: > Sounds like > > https://public-inbox.org/git/2016201958.2175-1-den...@kaarsemaker.net/ > > to me. A key message in the thread may be: > > > https://public-inbox.org/git/alpine.DEB.2.20.1611121106110.3746@virtualbox/ Sorry

[PATCH v3 3/4] worktree.c: kill parse_ref() in favor of refs_resolve_ref_unsafe()

The manual parsing code is replaced with a call to refs_resolve_ref_unsafe(). The manual parsing code must die because only refs/files-backend.c should do that. --- branch.c | 3 +- t/helper/test-ref-store.c | 19 ++ t/t1407-worktree-ref-store.sh

[PATCH v3 2/4] refs: introduce get_worktree_ref_store()

files-backend at this point is still aware of the per-repo/worktree separation in refs, so it can handle a linked worktree. Some refs operations are known not working when current files-backend is used in a linked worktree (e.g. reflog). Tests will be written when refs_* functions start to be

DON SPENDE

DON SPENDE Que la paix de notre Dieu tout-puissant soit à vous SPENDE VON BAHADUR Möge der Friede unseres allmächtigen Gottes zu euch sein Gruß im Namen unseres allmächtigen Gottes Ich wünsche dir und deiner Familie glückliche Momente des

[PATCH 0/8] Various changes to the "tag" command

This series incorporates and replaces all the "tag" patches I have floating around the list, and adds a lot in the mix which discovered while working on the initial two patches, but which made sense as separate patches. It's based no top of Jeff's gitster/jk/ref-filter-flags-cleanup. I'm

[PATCH] gitk: use right colour for remote refs in the "Tags and heads" dialog

Makes it easier to see which refs are local and which refs are remote. Adds consistency with the remote background colour in the graph display. Signed-off-by: Paul Wise --- gitk-git/gitk | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) diff --git

[PATCH v3 1/4] environment.c: fix potential segfault by get_git_common_dir()

setup_git_env() must be called before this function to initialize git_common_dir so that it returns a non NULL string. And it must return a non NULL string or segfault can happen because all callers expect so. Normally if somebody has called get_git_dir(), or set_git_dir() then setup_git_env() is

Assalamu`Alaikum.

Dear Sir/Madam. Assalamu`Alaikum. I am Dr mohammad ouattara, I have ($10.6 Million us dollars) to transfer into your account, I will send you more details about this deal and the procedures to follow when I receive a positive response from you, Have a great day, Dr mohammad ouattara.

Re: GSoC 2017: application open, deadline = February 9, 2017

On Mon, Jan 23, 2017 at 10:02 PM, Matthieu Moy wrote: > * We need to write the application, i.e. essentially polish and update > the text here: https://git.github.io/SoC-2016-Org-Application/ and > update the list of project ideas and microprojects : >

[PATCH v3 0/4] Kill manual ref parsing code in worktree.c

v3 is a rebased version on latest nd/files-backend-git-dir [1]. Since that series added a bunch of new refs_* functions, v2's 02/05 and 04/05 are removed. The new 01/04 could be an indepedent fix, but at test-ref-store.c requires it, so I put it here. More tests are added now that we have

[PATCH v2 03/12] revision.c: --indexed-objects add objects from all worktrees

This is the result of single_worktree flag never being set (no way to up until now). To get objects from current index only, set single_worktree. The other add_index_objects_to_pending's caller is mark_reachable_objects() (e.g. "git prune") which also mark objects from all indexes. ---

[PATCH v2 05/12] refs: move submodule slash stripping code to get_submodule_ref_store

This is a better place that will benefit all submodule callers instead of just resolve_gitlink_ref() --- refs.c | 33 + 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/refs.c b/refs.c index 8912798c1d..a38149d84a 100644 --- a/refs.c +++ b/refs.c @@

[PATCH v2 00/12] Fix git-gc losing objects in multi worktree

This is basically a rebased version after a lot of changes in nd/files-backend-git-dir. Thanks to test-ref-store.c, I found and fixed a bug in for_each_reflog in v1 code. This series needs latest nd/worktree-kill-parse-ref [1]. But you can get everything on my github fork, branch

[PATCH v2 09/12] revision.c: --all adds HEAD from all worktrees

Unless single_worktree is set, --all now adds HEAD from all worktrees. Since reachable.c code does not use setup_revisions(), we need to call other_head_refs_submodule() explicitly there to have the same effect on "git prune", so that we won't accidentally delete objects needed by some other

  1   2   >