Re: [PATCH v3 0/5] Expanding tabs in "git log" output

Jeff King writes: > On Wed, Mar 23, 2016 at 04:23:41PM -0700, Junio C Hamano wrote: > >> So here is the third try (previous round is found at $gmane/289166 >> and the very first one is at $gmane/288987). > > Is the plan to merge these as-is? The ordering is a bit funny (introduce

Re: [PATCH/GSoC 3/3] Nousage message in error

This is my first review. It can contain some mistakes. On Thu, Mar 24, 2016 at 7:33 AM, Diwas Joshi wrote: > Subject : [PATCH/GSoC 3/3] Nousage message in error Mention about GSoC in the notes section (the one followed by the 3 dashes ie. "---") rather than in the subject.

Re: [PATCH v2 3/4] format-patch: introduce --base=auto option

On Wed, Mar 23, 2016 at 11:25:41AM -0700, Junio C Hamano wrote: >Xiaolong Ye writes: > >> + >> +diff_setup(); >> +DIFF_OPT_SET(, RECURSIVE); >> +diff_setup_done(); > >It is annoying that you moved "diff" stuff here (if it can be >initialized once at the

Re: [PATCH v2 2/4] format-patch: add '--base' option to record base tree info

On Wed, Mar 23, 2016 at 11:08:20AM -0700, Junio C Hamano wrote: >Xiaolong Ye writes: > >Reviewing the patch out of order, caller first and then callee. > >> +static void print_bases(struct base_tree_info *bases) >> +{ >> +int i; >> + >> +/* Only do this once, either

Gitk "External diff" broken when using worktree

Hi, I'm using git 2.7.3 on cygwin, and have been taking advantage of the new "git worktree" feature. I noticed that when I launch gitk from one of the attached working directories, its "external diff" feature doesn't seem to work. Nothing shows up in the diff tool at all. However, it works if you

"git svn fetch" error: [main] perl 9296 child_info_fork::abort: unable to map

Hi, all I meet below error when using the "git svn" related command, and I tried to reinstall the GIT but the issue is still there. Has anybody ever meet this and know how to solve it? GIT version: git version 2.7.4.windows.1 OS: Windows 8 64bit $ git svn fetch 4 [main] perl 9296

[PATCH/GSoC 3/3] Nousage message in error

- To show only error text instead of full usage message - Adds exits to callback function in parse-options-cb.c instead of returning -1 which results in display of usage message. --- parse-options-cb.c | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/parse-options-cb.c

Re: [PATCH v3 0/5] Expanding tabs in "git log" output

On Wed, Mar 23, 2016 at 04:23:41PM -0700, Junio C Hamano wrote: > So here is the third try (previous round is found at $gmane/289166 > and the very first one is at $gmane/288987). Is the plan to merge these as-is? The ordering is a bit funny (introduce breakage, then repair it), and I think the

Re: [RFC_PATCHv4 5/7] submodule update: respect submodule.actionOnLabel

Stefan Beller writes: > On Tue, Mar 22, 2016 at 3:40 PM, Junio C Hamano wrote: >> Stefan Beller writes: >> >>> This change introduces the 'submodule.actionOnLabel' variable >>> in a repository configuration. Generally speaking

Re: [PATCH v3 0/5] Expanding tabs in "git log" output

On Wed, Mar 23, 2016 at 4:23 PM, Junio C Hamano wrote: > So here is the third try (previous round is found at $gmane/289166 > and the very first one is at $gmane/288987). > > The first three patches are essentially the same as v2. The last > two updates how the tab-expansion

GSoC 2016 | Proposal | Incremental Rewrite of git bisect

Hey! I have prepared a proposal for Google Summer of Code 2016. I know this is a bit late, but please try to give your comments and suggestions. My proposal could greatly improve from this. Some questions: 1. Should I include more ways in which it can help windows? 2. Should I include the

[PATCH v3 2/5] pretty-print: simplify the interaction between pp_handle_indent() and its caller

Instead of sometimes handling the output itself and some other times forcing the caller handle the output, make the helper function pp_handle_indent() responsible for the output for all cases. Signed-off-by: Junio C Hamano --- pretty.c | 32 +--- 1

[PATCH v3 3/5] pretty-print: further abstract out pp_handle_indent()

Separate the call to add 4-space indent, and a new helper to add a line after de-tabifying. The new helper function strbuf_add_tabexpand() could later be moved to strbuf.[ch] if other callers need to. Signed-off-by: Junio C Hamano --- pretty.c | 24 +++-

[PATCH v3 0/5] Expanding tabs in "git log" output

So here is the third try (previous round is found at $gmane/289166 and the very first one is at $gmane/288987). The first three patches are essentially the same as v2. The last two updates how the tab-expansion is internally controlled: [4/5] adds a bit to pretty-commit-context that tells if

[PATCH v3 4/5] pretty-print: limit expand-tabs to selected --pretty formats

Make sure that "git log" (by default, it uses --pretty=medium) and "git log --pretty={full,fuller}" are the only ones that trigger the new "expand tabs in the log message" behaviour. Signed-off-by: Junio C Hamano --- commit.h| 1 + log-tree.c | 1 +

[PATCH v3 5/5] pretty-print: teach "--no-expand-tabs" option to "git log"

The output formats of "git log" that indent the log message by 4 spaces have been updated to expand tabs by default in previous steps, without a way to restore the original behaviour. Introduce a new "--no-expand-tabs" option to allow this. As the effect of options is cumulative, $ git log

[PATCH v3 1/5] pretty-print: de-tabify indented logs to make things line up properly

From: Linus Torvalds A commit log message sometimes tries to line things up using tabs, assuming fixed-width font with the standard 8-place tab settings. Viewing such a commit however does not work well in "git log", as we indent the lines by prefixing 4 spaces in

Re: [RFC_PATCHv4 5/7] submodule update: respect submodule.actionOnLabel

On Tue, Mar 22, 2016 at 3:40 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> This change introduces the 'submodule.actionOnLabel' variable >> in a repository configuration. Generally speaking 'submodule.actionOnLabel' >> restricts the action of a

Re: [PATCH] sha1_name.c: add an option to abort on ambiguous refs

On Wed, Mar 23, 2016 at 10:45 PM, Johannes Schindelin wrote: > Hi Duy, > > On Wed, 23 Mar 2016, Nguyễn Thái Ngọc Duy wrote: > >> There are cases when a warning on ambiguous refs may go unnoticed >> (e.g. git-log filling up the whole screen). There are also cases when

[PATCH] mergetools: implemented new mergetool file for ExamDiff

Signed-off-by: Jacob Nisnevich --- mergetools/examdiff | 20 mergetools/mergetools_helpers | 24 mergetools/winmerge | 23 +++ 3 files changed, 47 insertions(+), 20 deletions(-)

[PATCH] mergetools: implemented new mergetool file for ExamDiff

Thanks for the hint. I used the other examples to fix the implementation of the ExamDiff mergetool. I've tested the Winmerge and ExamDiff mergetools with both `git difftool` and `git mergetool` and both seem to work as expected. I've combined all my changes into one patch. Are there any other

Re: [PATCH 4/4] mingw: skip some tests in t9115 due to file name issues

> > Thanks; Torsten, sorry but could you do another round of check, please? Thanks, v2 tested OK under Mac OS and Linux -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at

Re: "git tag --contains " is too chatty, if is invalid

On Sun, Mar 20, 2016 at 12:19:46PM +0530, Chirayu Desai wrote: > I went for 3, and have sent a patch for that here - [PATCH/GSoC] > parse-options: Add a new nousage opt > However, it currently has one bug > Running 'git tag --contains qq' twice will first show an error, then > print qq, meaning

Re: [PATCH/GSoC] parse-options: Add a new nousage opt

On Sun, Mar 20, 2016 at 12:16:45PM +0530, Chirayu Desai wrote: > diff --git a/parse-options-cb.c b/parse-options-cb.c > index 239898d946..ac2ea4d674 100644 > --- a/parse-options-cb.c > +++ b/parse-options-cb.c > @@ -85,11 +85,15 @@ int parse_opt_commits(const struct option *opt, const > char

Re: [PATCH] git-send-pack: Fix --all option when used with directory

On Wed, Mar 23, 2016 at 05:22:13PM -0400, Jeff King wrote: > > diff --git a/t/t9904-send-pack-all.sh b/t/t9904-send-pack-all.sh > > The tests are roughly grouped by functionality. send-pack tests are in > the t540x range, and this should probably go there. Though I also > suspect it could easily

CISCO IP PHONES AND CPU's

Hi, Our Stock list. Brand NEW 96 x Cisco 7900 IP Phone 87 x Unified IP Phone 6900 12 x Unified IP Phone 8900 76 x Unified IP Phone 9900 55 x Unified IP Phone 8800 67 x Cisco 1921 67 x Cisco 1941 56 x Cisco CP-7961G 7961G 34 x Cisco CP-7971G-GE 7971G 19 x Cisco Unified IP Conference Station 7937G

Re: [PATCH] git-send-pack: Fix --all option when used with directory

On Wed, Mar 23, 2016 at 06:24:22PM +0200, Stanislav Kolotinskiy wrote: > When using git send-pack with --all option > and a target directory, usage message is being > displayed instead of performing the actual transmission. Yeah, that seems very wrong. Not that it matters for this bug, but for

What's cooking in git.git (Mar 2016, #04; Wed, 23)

Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. The ones marked with '.' do not appear in any of the integration branches, but I am still holding onto them. Three more minor fix-up topics

Re: [RFC_PATCHv4 3/7] submodule-config: add method to check for being labeled

On Tue, Mar 22, 2016 at 3:30 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> In later patches we need to tell if a submodule is labeled by >> the given labels. >> >> Signed-off-by: Stefan Beller >> --- > > Hmph, I would have

Re: [PATCH] git_config_push_parameter: handle empty GIT_CONFIG_PARAMETERS

Jonathan Nieder writes: > I should have mentioned this is > > Reported-by: Shin Fan > >> Signed-off-by: Jeff King >> --- >> I just did this on master, and it is standalone. But for the reasons >> above I think it would also be fine to

Re: [PATCH v8 2/2] commit: add a commit.verbose config variable

Pranit Bauva writes: > On Thu, Mar 24, 2016 at 12:49 AM, Junio C Hamano wrote: >> Pranit Bauva writes: >> >>> On Sun, Mar 20, 2016 at 11:04 PM, Eric Sunshine >>> wrote: >>> ... Alternatively,

Re: [PATCH v8 2/2] commit: add a commit.verbose config variable

On Thu, Mar 24, 2016 at 12:49 AM, Junio C Hamano wrote: > Pranit Bauva writes: > >> On Sun, Mar 20, 2016 at 11:04 PM, Eric Sunshine >> wrote: >> ... >>> Alternatively, combine #1 and #2 into a single patch which drops the >>>

Re: [PATCH v8 2/2] commit: add a commit.verbose config variable

Pranit Bauva writes: > On Sun, Mar 20, 2016 at 11:04 PM, Eric Sunshine > wrote: > ... >> Alternatively, combine #1 and #2 into a single patch which drops the >> global test_set_editor() and, as an aside, also does "while here, >> let's use

Re: [PATCH 4/4] mingw: skip some tests in t9115 due to file name issues

On 2016-03-23 16.56, Junio C Hamano wrote: >> Thanks, I used a slightly different version, as I had crafted it before >> reading this mail already. > > Thanks; Torsten, sorry but could you do another round of check, please? Sure :-) -- To unsubscribe from this list: send the line "unsubscribe

Re: [PATCH v3] bisect--helper: convert a function in shell to C

On Wed, Mar 23, 2016 at 9:45 PM, Junio C Hamano wrote: > Johannes Schindelin writes: > >>> +if (one_of(term, "help", "start", "skip", "next", "reset", "visualize", >>> +"replay", "log", "run", NULL)) >> >> If I understood Junio

Re: [PATCH v3] bisect--helper: convert a function in shell to C

On Wed, Mar 23, 2016 at 9:54 PM, Junio C Hamano wrote: > Pranit Bauva writes: > >> On Wed, Mar 23, 2016 at 5:27 PM, Johannes Schindelin >> wrote: >>> Hi Pranit, >>> >>> On Wed, 23 Mar 2016, Pranit Bauva wrote: >>>

Re: [PATCH v2 3/4] format-patch: introduce --base=auto option

Xiaolong Ye writes: > + > + diff_setup(); > + DIFF_OPT_SET(, RECURSIVE); > + diff_setup_done(); It is annoying that you moved "diff" stuff here (if it can be initialized once at the beginning and then reused over and over, it should have been done here from

Re: [PATCH v2 2/4] format-patch: add '--base' option to record base tree info

Xiaolong Ye writes: Reviewing the patch out of order, caller first and then callee. > +static void print_bases(struct base_tree_info *bases) > +{ > + int i; > + > + /* Only do this once, either for the cover or for the first one */ > + if

Re: [PATCH] add option -n (--no-checkout) to git-worktree add

On Wed, Mar 23, 2016 at 11:51 AM, Junio C Hamano wrote: > Ray Zhang writes: > >> @@ -320,6 +323,7 @@ static int add(int ac, const char **av, const char >> *prefix) >> OPT_STRING('B', NULL, _branch_force, N_("branch"), >>

Re: git-apply does not work in a sub-directory of a Git repository

On Wed, Mar 23, 2016 at 8:51 PM, Junio C Hamano wrote: > I think we do have --no-index (which is why I am largely ignoring > the rest of your message as uninformed speculation for now). --no-index command line flag is there for git-apply but unfortunately not documented. Also

Re: Issue with git submodule update --init --depth=1 submodA

On Wed, Mar 23, 2016 at 1:28 AM, Jared Davison wrote: > Hello all, > > I have encountered a problem with using submodules. > > The problem occurs when using > > repo-parent$ git submodule update --init --depth=1 submodA > > Submodule 'submoduleA' (.../submoduleA.git)

Re: git-apply does not work in a sub-directory of a Git repository

Junio C Hamano writes: > See > > http://thread.gmane.org/gmane.comp.version-control.git/288316/focus=288321 > > I agree it is bad that it silently ignores the path outside the > directory. When run with --verbose, we should say "Skipped X that > is outside the directory."

Re: [PATCH 1/4] config --show-origin: report paths with forward slashes

Johannes Schindelin writes: >> > diff --git a/path.c b/path.c >> > index 8b7e168..969b494 100644 >> > --- a/path.c >> > +++ b/path.c >> > @@ -584,6 +584,9 @@ char *expand_user_path(const char *path) >> >if (!home) >> >

Re: [PATCH v3] bisect--helper: convert a function in shell to C

Pranit Bauva writes: > On Wed, Mar 23, 2016 at 5:27 PM, Johannes Schindelin > wrote: >> Hi Pranit, >> >> On Wed, 23 Mar 2016, Pranit Bauva wrote: >> >>> Convert the code literally without changing its design even though it >>> seems that it is

[PATCH] git-send-pack: Fix --all option when used with directory

When using git send-pack with --all option and a target directory, usage message is being displayed instead of performing the actual transmission. The reason for this issue is that refspecs variable is being calculated in a different way comparing to previous versions, and even though the number

Re: [PATCH v3] bisect--helper: convert a function in shell to C

Johannes Schindelin writes: >> +if (one_of(term, "help", "start", "skip", "next", "reset", "visualize", >> +"replay", "log", "run", NULL)) > > If I understood Junio correctly, he meant to line up the second line with > the corresponding level. In this

Re: [PATCH 4/4] mingw: skip some tests in t9115 due to file name issues

Johannes Schindelin writes: > Hi Junio & Torsten, > > On Wed, 23 Mar 2016, Torsten Bögershausen wrote: > >> On 2016-03-22 23.57, Junio C Hamano wrote: >> > Dscho, I queued two out of these four, with a proposed fix-up patch >> > for each of them, on 'pu'; but I won't

Re: [PATCH] add option -n (--no-checkout) to git-worktree add

Ray Zhang writes: > @@ -320,6 +323,7 @@ static int add(int ac, const char **av, const char > *prefix) > OPT_STRING('B', NULL, _branch_force, N_("branch"), > N_("create or reset a branch")), > OPT_BOOL(0, "detach", ,

Re: [PATCH] add option -n (--no-checkout) to git-worktree add

On Wed, Mar 23, 2016 at 11:08 AM, Ray Zhang wrote: > add option -n (--no-checkout) to git-worktree add Alternate: worktree: add: introduce --no-checkout option > By adding option -n, we can make some customizations before checkout, like > sparse checkout, etc. This

Re: [PATCH] sha1_name.c: add an option to abort on ambiguous refs

Hi Duy, On Wed, 23 Mar 2016, Nguyễn Thái Ngọc Duy wrote: > There are cases when a warning on ambiguous refs may go unnoticed > (e.g. git-log filling up the whole screen). There are also cases when > people want to catch ambiguity early (e.g. it happens deep in some > script). In either case,

[PATCH] add option -n (--no-checkout) to git-worktree add

By adding option -n, we can make some customizations before checkout, like sparse checkout, etc. Signed-off-by: Ray Zhang --- builtin/worktree.c | 14 +- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/builtin/worktree.c b/builtin/worktree.c

Re: git-apply does not work in a sub-directory of a Git repository

Duy Nguyen writes: > 1) add --no-index to force git-apply ignore .git, --git (or some other > name) to apply patches as if running from topdir, add a config key to > choose default behavior I think we do have --no-index (which is why I am largely ignoring the rest of your

[GIT PULL] l10n updates for 2.8.0 round 3#2

Hi Junio, The following changes since commit 26e4cbec4558ea21cd572bfc915a462f63c1ebb4: l10n: zh_CN: review for git v2.8.0 l10n round 2 (2016-03-20 18:46:02 +0800) are available in the git repository at: git://github.com/git-l10n/git-po master for you to fetch changes up to

Re: [PATCH v2] bisect--helper: convert a function in shell to C

On Wed, Mar 23, 2016 at 4:52 PM, Johannes Schindelin wrote: > Hi Pranit, > > On Tue, 22 Mar 2016, Pranit Bauva wrote: > >> I did run the tests. They produce the same results as they did before. >> To ease review I will next time include these the output of the tests >>

[PATCH] sha1_name.c: add an option to abort on ambiguous refs

There are cases when a warning on ambiguous refs may go unnoticed (e.g. git-log filling up the whole screen). There are also cases when people want to catch ambiguity early (e.g. it happens deep in some script). In either case, aborting the program would accomplish it. Signed-off-by: Nguyễn Thái

Re: [PATCH v3] bisect--helper: convert a function in shell to C

On Wed, Mar 23, 2016 at 5:27 PM, Johannes Schindelin wrote: > Hi Pranit, > > On Wed, 23 Mar 2016, Pranit Bauva wrote: > >> Convert the code literally without changing its design even though it >> seems that it is obscure as to the use of comparing revision to different

Re: [PATCH v3] bisect--helper: convert a function in shell to C

Hi Pranit, On Wed, 23 Mar 2016, Pranit Bauva wrote: > Convert the code literally without changing its design even though it > seems that it is obscure as to the use of comparing revision to different > bisect arguments which seems like a problem in shell because of the way > function arguments

Re: [PATCH v2] bisect--helper: convert a function in shell to C

Hi, On Tue, 22 Mar 2016, Stefan Beller wrote: > On Tue, Mar 22, 2016 at 10:52 AM, Pranit Bauva wrote: > > OPT_CMDMODE() is actually a better option. I also noticed that it > > isn't mentioned in Documentation/technical/api-parse-options.txt . > > Should I send a patch to

Re: [PATCH v2] bisect--helper: convert a function in shell to C

Hi Pranit, On Tue, 22 Mar 2016, Pranit Bauva wrote: > On Tue, Mar 22, 2016 at 8:41 PM, Johannes Schindelin > wrote: > > > > On Tue, 22 Mar 2016, Johannes Schindelin wrote: > > > >> On Tue, 22 Mar 2016, Pranit Bauva wrote: > >> > >> > + if (!strcmp(term, "bad") ||

Re: [PATCH v2] bisect--helper: convert a function in shell to C

Hi Pranit, On Tue, 22 Mar 2016, Pranit Bauva wrote: > I did run the tests. They produce the same results as they did before. > To ease review I will next time include these the output of the tests > in the commented section. > > t6002-rev-list-bisect.sh : http://paste.ubuntu.com/15473728/ >

Re: [PATCH v2 3/4] t1300: fix the new --show-origin tests on Windows

On 23 Mar 2016, at 11:55, Johannes Schindelin wrote: > On Windows, we have that funny situation where the test script can refer > to POSIX paths because it runs in a shell that uses a POSIX emulation > layer ("MSYS2 runtime"). Yet, git.exe does *not* understand

[PATCH v3 1/2] Documentation: fix git-p4 AsciiDoc formatting

From: Lars Schneider Noticed-by: Eric Sunshine Signed-off-by: Lars Schneider --- Documentation/git-p4.txt | 8 +++- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Documentation/git-p4.txt

[PATCH v3 2/2] Documentation: use ASCII quotation marks in git-p4

From: Lars Schneider Signed-off-by: Lars Schneider --- Documentation/git-p4.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt index 6efe830..35e3170 100644 ---

[PATCH v3 0/2] git-p4: fix AsciiDoc formatting

From: Lars Schneider diff to v2: * mimick git-commit instead of git-bisect-lk2009 for references Thanks, Lars Lars Schneider (2): Documentation: fix git-p4 AsciiDoc formatting Documentation: use ASCII quotation marks in git-p4 Documentation/git-p4.txt | 10

[PATCH v2 1/4] config --show-origin: report paths with forward slashes

On Windows, the backslash is the native directory separator, but all supported Windows versions also accept the forward slash in most circumstances. Our tests expect forward slashes. Relative paths are generated by Git using forward slashes. So let's try to be consistent and use forward slashes

[PATCH v2 3/4] t1300: fix the new --show-origin tests on Windows

On Windows, we have that funny situation where the test script can refer to POSIX paths because it runs in a shell that uses a POSIX emulation layer ("MSYS2 runtime"). Yet, git.exe does *not* understand POSIX paths at all but only pure Windows paths. So let's just convert the POSIX paths to

[PATCH v2 4/4] mingw: skip some tests in t9115 due to file name issues

These two tests wanted to write file names which are incompatible with Windows' file naming rules (even if they pass using Cygwin due to Cygwin's magic path mangling). While at it, skip the same tests also on MacOSX/HFS, as pointed out by Torsten Bögershausen. Signed-off-by: Johannes Schindelin

[PATCH v2 2/4] Make t1300-repo-config resilient to being run via 'sh -x'

One of this developer's primary tools to diagnose broken regression tests is to run the test script using 'sh -x t... -i -v' to find out *which* call *actually* demonstrates the symptom. Hence it is pretty counterproductive if the test script behaves differently when being run via 'sh -x', in

[PATCH v2 0/4] Git for Windows fixes in preparation for 2.8.0

The t1300 and t9115 tests regressed on Windows. These patches fix that. Johannes Schindelin (4): config --show-origin: report paths with forward slashes Make t1300-repo-config resilient to being run via 'sh -x' t1300: fix the new --show-origin tests on Windows mingw: skip some tests in

Re: [PATCH 4/4] mingw: skip some tests in t9115 due to file name issues

Hi Junio & Torsten, On Wed, 23 Mar 2016, Torsten Bögershausen wrote: > On 2016-03-22 23.57, Junio C Hamano wrote: > > Dscho, I queued two out of these four, with a proposed fix-up patch > > for each of them, on 'pu'; but I won't squash them together myself > > without hearing from you as I do

Re: [PATCH 3/4] t1300: fix the new --show-origin tests on Windows

Hi Junio, On Tue, 22 Mar 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > On Windows, we have that funny situation where the test script can refer > > to POSIX paths because it runs in a shell that uses a POSIX emulation > > layer ("MSYS2 runtime").

Re: [PATCH v7 04/33] files-backend: break out ref reading

On 03/01/2016 01:52 AM, David Turner wrote: > Refactor resolve_ref_1 in terms of a new function read_raw_ref, which > is responsible for reading ref data from the ref storage. > > Later, we will make read_raw_ref a pluggable backend function, and make > resolve_ref_unsafe common. > > Testing

Re: git-apply does not work in a sub-directory of a Git repository

On Wed, Mar 23, 2016 at 5:14 AM, Stefan Beller wrote: >> Hello everyone, >> As you observed, patch wasn't applied. Is it intended behaviour of >> git-apply? Usually to apply the patch I have to copy it to top directory >> and then use git-apply. >> >> I tried out git-am to

[PATCH v3/GSoC 5/5] t0301: test credential-cache support of XDG_RUNTIME_DIR

t0301 now tests git-credential-cache support for XDG user-specific runtime path. Specifically: * if $XDG_RUNTIME_DIR exists, use socket at `$XDG_RUNTIME_DIR/git/credential-cache.sock`. * otherwise, `/tmp/git-$uid/credential-cache.sock` is taken. Helped-by: Jeff King

[PATCH v3/GSoC 3/5] git-credential-cache: put socket to xdg-compatible path

move .git-credential-cache/socket to xdg_runtime_dir("credential-cache.sock") Signed-off-by: Hui Yiqun --- credential-cache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/credential-cache.c b/credential-cache.c index f4afdc6..40d838b 100644 ---

[PATCH 08/21] resolve_ref_unsafe(): ensure flags is always set

If the caller passes flags==NULL, then set it to point at a local scratch variable. This removes the need for a lot of "if (flags)" guards in resolve_ref_1() and resolve_missing_loose_ref(). Signed-off-by: Michael Haggerty --- refs/files-backend.c | 31

[PATCH 14/21] Inline resolve_ref_1() into resolve_ref_unsafe()

resolve_ref_unsafe() wasn't doing anything useful anymore. Signed-off-by: Michael Haggerty --- refs/files-backend.c | 31 +-- 1 file changed, 9 insertions(+), 22 deletions(-) diff --git a/refs/files-backend.c b/refs/files-backend.c index

[PATCH v3/GSoC 2/5] path.c: implement xdg_runtime_dir()

This function is aimed to provide an uniform location to put runtime files according to the xdg base dir spec[1] and stop using $HOME. On the other hand, the safety is considered(with directory permission). This function will use `$XDG_RUNTIME_DIR/git` if XDG_RUNTIME_DIR exists, otherwise

[PATCH 10/21] resolve_ref_1(): reorder code

There is no need to adjust *flags if we're just about to fail. Signed-off-by: Michael Haggerty --- refs/files-backend.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/refs/files-backend.c b/refs/files-backend.c index 69ec903..60f1493 100644 ---

[PATCH 11/21] resolve_ref_1(): eliminate local variable "bad_name"

We can use (*flags & REF_BAD_NAME) for that purpose. Signed-off-by: Michael Haggerty --- refs/files-backend.c | 13 + 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/refs/files-backend.c b/refs/files-backend.c index 60f1493..b865ba5 100644 ---

[PATCH v3/GSoC 4/5] test-lib.sh: unset all environment variables defined in xdg base dir spec[1]

Otherwise, on environments where these variables and set, an assignment to one of these variables will cause the variable being implicitly exported. For example: $ XDG_RUNTIME_DIR=/run/user/2000 bash $ XDG_RUNTIME_DIR=/tmp/whatever # it should not be exported! $ bash $ echo

[PATCH 16/21] fsck_head_link(): remove unneeded flag variable

It is never read, so we can pass NULL to resolve_ref_unsafe(). Signed-off-by: Michael Haggerty --- builtin/fsck.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/builtin/fsck.c b/builtin/fsck.c index 55eac75..3f27456 100644 --- a/builtin/fsck.c +++

[PATCH v3/GSoC 1/5] path.c: implement strbuf_mkpath()

There were already `mkpath`, `mkpathdup` and `mksnpath` for build filename, but lacked a version of `strbuf_` just like `strbuf_git_path`. It is convenient to build a path and manipulate the result later with strbuf. Signed-off-by: Hui Yiqun --- cache.h | 2 ++ path.c |

[PATCH 15/21] read_raw_ref(): change flags parameter to unsigned int

read_raw_ref() is going to be part of the vtable for reference backends, so clean up its interface to use "unsigned int flags" rather than "int flags". Its caller still uses signed int for its flags arguments. But changing that would touch a lot of code, so leave it for now. Signed-off-by:

[PATCH 01/21] t1430: test the output and error of some commands more carefully

Signed-off-by: Michael Haggerty --- t/t1430-bad-ref-name.sh | 18 -- 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/t/t1430-bad-ref-name.sh b/t/t1430-bad-ref-name.sh index c465abe..005e2b1 100755 --- a/t/t1430-bad-ref-name.sh +++

[PATCH 20/21] check_aliased_update(): check that dst_name is non-NULL

If there is an error in resolve_ref_unsafe(), it returns NULL. We check for this case, but not until after calling strip_namespace(). Instead, call strip_namespace() *after* the NULL check. Signed-off-by: Michael Haggerty --- builtin/receive-pack.c | 2 +- 1 file changed,

[PATCH 09/21] resolve_ref_1(): eliminate local variable

In place of `buf`, use `refname`, which is anyway a better description of what is being pointed at. Signed-off-by: Michael Haggerty --- refs/files-backend.c | 13 ++--- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/refs/files-backend.c

[PATCH 13/21] read_raw_ref(): manage own scratch space

Instead of creating scratch space in resolve_ref_unsafe() and passing it down through resolve_ref_1 to read_raw_ref(), teach read_raw_ref() to manage its own scratch space. This reduces coupling across the functions at the cost of some extra allocations. Also, when read_raw_ref() is implemented

[PATCH 18/21] get_default_remote(): remove unneeded flag variable

It is never read, so we can pass NULL to resolve_ref_unsafe(). Signed-off-by: Michael Haggerty --- builtin/submodule--helper.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index

[PATCH 02/21] t1430: clean up broken refs/tags/shadow

Signed-off-by: Michael Haggerty --- t/t1430-bad-ref-name.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t1430-bad-ref-name.sh b/t/t1430-bad-ref-name.sh index 005e2b1..cb815ab 100755 --- a/t/t1430-bad-ref-name.sh +++ b/t/t1430-bad-ref-name.sh @@

[PATCH 07/21] resolve_ref_unsafe(): use for loop to count up to MAXDEPTH

The loop's there anyway; we might as well use it. Signed-off-by: Michael Haggerty --- refs/files-backend.c | 13 ++--- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/refs/files-backend.c b/refs/files-backend.c index c0cf6fd..101abba 100644 ---

[PATCH 04/21] t1430: test for-each-ref in the presence of badly-named refs

Signed-off-by: Michael Haggerty --- t/t1430-bad-ref-name.sh | 16 1 file changed, 16 insertions(+) diff --git a/t/t1430-bad-ref-name.sh b/t/t1430-bad-ref-name.sh index a963951..612cc32 100755 --- a/t/t1430-bad-ref-name.sh +++ b/t/t1430-bad-ref-name.sh @@

[PATCH 03/21] t1430: don't rely on symbolic-ref for creating broken symrefs

It's questionable whether it should even work. Signed-off-by: Michael Haggerty --- t/t1430-bad-ref-name.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/t/t1430-bad-ref-name.sh b/t/t1430-bad-ref-name.sh index cb815ab..a963951 100755 ---

[PATCH 00/21] replacement for dt/refs-backend-lmdb v7 patch 04/33

Patch 04/33 in David Turner's refs-backend-lmdb series v7 [1] did way too much in a single patch, and in fact got a few minor things wrong. Instead of that patch, I suggest this patch series, which * Splits the changes into smaller steps. * Adds a bunch of tests of deleting references with

[PATCH 12/21] files-backend: break out ref reading

From: David Turner Refactor resolve_ref_1 in terms of a new function read_raw_ref, which is responsible for reading ref data from the ref storage. Later, we will make read_raw_ref a pluggable backend function, and make resolve_ref_unsafe common. Signed-off-by: David

[PATCH 19/21] checkout_paths(): remove unneeded flag variable

It is never read, so we can pass NULL to resolve_ref_unsafe(). Signed-off-by: Michael Haggerty --- builtin/checkout.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/builtin/checkout.c b/builtin/checkout.c index cfa66e2..ef42237 100644 ---

[PATCH 06/21] resolve_missing_loose_ref(): simplify semantics

Make resolve_missing_loose_ref() only responsible for looking up a packed reference, without worrying about whether we want to read or write the reference and without setting errno on failure. Move the other logic to the caller. Signed-off-by: Michael Haggerty ---

[PATCH 17/21] cmd_merge(): remove unneeded flag variable

It is never read, so we can pass NULL to resolve_ref_unsafe(). Signed-off-by: Michael Haggerty --- builtin/merge.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/merge.c b/builtin/merge.c index df0afa0..a91ae5b 100644 --- a/builtin/merge.c

[PATCH 21/21] show_head_ref(): check the result of resolve_ref_namespace()

Only use the result of resolve_ref_namespace() if it is non-NULL. Signed-off-by: Michael Haggerty --- http-backend.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/http-backend.c b/http-backend.c index 8870a26..2148814 100644 --- a/http-backend.c

[PATCH 05/21] t1430: improve test coverage of deletion of badly-named refs

Check "branch -d broken...ref" Check various combinations of * Deleting using "update-ref -d" * Deleting using "update-ref --no-deref -d" * Deleting using "branch -d" in the following combinations of symref -> ref: * badname -> broken...ref * badname -> broken...ref (dangling) *

  1   2   >