Re: commit -> public-inbox link helper

On Wed, Apr 4, 2018 at 12:35 PM, Johannes Schindelin wrote: > Hi team, > > I found myself in dear need to quickly look up mails in the public-inbox > mail archive corresponding to any given commit in git.git. Some time ago, > I wrote a shell script to help me with

Re: [PATCH] push: add config option to --force-with-lease by default.

On Wed, Jul 5, 2017 at 12:43 PM, Francesco Mazzoli wrote: >> On 5 Jul 2017, at 17:17, Junio C Hamano wrote: >> >> The take-away lesson that the earlier thread gave me was that the >> order in which the three options are ranked by their desirebility >> in the UI

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

On Tue, Apr 25, 2017 at 5:57 AM, Andreas Schwab wrote: > On Apr 25 2017, Liam Beguin wrote: > >> Add the 'rebase.abbrevCmd' boolean config option to allow `git rebase -i` >> to abbreviate the command-names in the instruction list. >> >> This means

Re: [ANNOUNCE] Git for Windows 2.12.2

Forwarding to the lists, as my original message was rejected for html. On Thu, Mar 30, 2017 at 3:44 PM, Andrew Witte wrote: > Just updated back to git 2.12.2 and git-lfs 2.0.2 and everything worked > fine. Wish I could have gotten more info when it happened as its happened

Re: [PATCH] rev-parse --git-path: fix output when running in a subdirectory

On Thu, Feb 9, 2017 at 5:54 PM, Junio C Hamano wrote: > > That leaves what the right single-step behaviour change should be. > As I recall Duy said something about --common-dir and other things > Mike's earlier change also covered, I'd prefer to leave it to three > of you to

Re: [PATCH] rev-parse --git-path: fix output when running in a subdirectory

On Thu, Feb 9, 2017 at 4:48 AM, Duy Nguyen wrote: > On Wed, Feb 8, 2017 at 7:17 PM, Johannes Schindelin > wrote: >> In addition to making git_path() aware of certain file names that need >> to be handled differently e.g. when running in worktrees,

Re: merge --no-ff is NOT mentioned in help

(Please reply inline) On Wed, Nov 16, 2016 at 10:48 AM, Vanderhoof, Tzadik wrote: > I am running:git version 2.10.1.windows.1 > > I typed: git merge -h > > and got: > > usage: git merge [] [...] >or: git merge [] HEAD >or: git merge --abort > >

Re: merge --no-ff is NOT mentioned in help

On Wed, Nov 16, 2016 at 10:16 AM, Vanderhoof, Tzadik wrote: > When I do: "git merge -h" to get help, the option "--no-ff" is left out of > the list of options. I am running git version 2.10.0, and running git merge --help contains these lines: --ff

Re: git diff

On Wed, Oct 12, 2016 at 6:50 AM, wrote: > Hi. > > I created a new branch named hotfix from master. > I switched to the branch, changed 1 file. > > Now I want to see the diff from the both using > > git diff hotfix master > > I do not see any output (difference). > When

Re: [PATCH] make rebase respect core.hooksPath if set

On Sun, Aug 14, 2016 at 12:29 PM, ryenus wrote: > Patch attached. > > It seems gmail ruined the white spaces. > Not sure how to stop gmail from doing that. > Sorry for me, and for Gmail. Did you use git-send-email? I don't think that the gmail ui works. If you have 2-factor

Re: [BUG] gitk

On Wed, Jun 8, 2016 at 8:31 AM, Eric Frederich wrote: > Thanks for confirming. I do a similar workaround too. > The issue is when new Git users don't even have a ~/.config/git/gitk to > modify. > They first have to run it natively where lime exists, then they can >

Re: [PATCH] Documentation: add instructions to help setup gmail 2FA

On Fri, May 27, 2016 at 5:06 PM, Junio C Hamano wrote: > Michael Rappazzo writes: > >> For those who use two-factor authentication with gmail, git-send-email >> will not work unless it is setup with an app-specific password. The >> example for setting up

Re: [PATCH] rev-parse: fix --git-common-dir when executed from subpath of main tree

On Thu, May 19, 2016 at 3:49 AM, Mike Hommey <m...@glandium.org> wrote: > On Fri, Apr 08, 2016 at 08:35:51AM -0400, Mike Rappazzo wrote: >> On Fri, Apr 8, 2016 at 7:47 AM, Duy Nguyen <pclo...@gmail.com> wrote: >> > On Mon, Apr 4, 2016 at 8:42 AM, Michael Rappazzo &l

Re: [PATCH v3 1/2] rev-parse tests: add tests executed from a subdirectory

On Fri, May 6, 2016 at 6:10 PM, Junio C Hamano wrote: > Michael Rappazzo writes: > >> t1500-rev-parse contains envrionment leaks (changing dir without >> changing back, setting config variables, etc). Add a test to clean this >> up up so that future tests

Re: [PATCH v2 1/4] rev-parse: fix some options when executed from subpath of main tree

On Fri, Apr 29, 2016 at 9:50 AM, SZEDER Gábor wrote: >> Executing `git-rev-parse` with `--git-common-dir`, `--git-path `, >> or `--shared-index-path` from the root of the main worktree results in >> a relative path to the git dir. >> >> When executed from a subdirectory of the

Re: [PATCH v3 0/2] gitk: changes for the "Tags and heads" view

On Sun, Mar 27, 2016 at 11:06 AM, Michael Rappazzo wrote: > Changes since v2[1]: > - Instead of getting the remote info for each local branch individually, >grab it all at once and store the result > - Instead of a command line option to enable the new sorting option, >

Re: "gitk --author=foo" shows also parent

On Tue, Apr 26, 2016 at 9:08 AM, Nikolai Kosjar wrote: > Hi! > > $ gitk --author=foo > > ...seems to show also the parent of each author-matched commit, whereas > > $ git log --author=foo > > does not. Is this intended or a bug? I've stumbled over this while

Re: [PATCH 13/21] rev-parse: add '--absolute-git-dir' option

On Thu, Feb 25, 2016 at 5:54 PM SZEDER Gábor wrote: > > Some scripts can benefit from not having to deal with the possibility > of relative paths to the repository, but the output of 'git rev-parse > --git-dir' can be a relative path. Case in point: supporting 'git -C > ' in

Re: Cannot checkout a branch / worktree shows multiple branches for the same directory

On Thu, Apr 14, 2016 at 3:51 PM, Krzysztof Voss wrote: > Hi, > > I stumbled upon an interesting problem when checking out a branch. > I had to switch to a testing branch to merge in some changes from yet > another branch, but when I tried to check out the testing branch I got > a

Re: [PATCH] gitk: Fix how remote branch names with / are drawn

s an extended-regex, and your version is probably more efficient anyway. echo "remotes/origin/dev/test1" | grep -Eo "remotes/.*?/" > > > Thank you. > (Most people on this list don't like "top posting"), please try to reply inline instead. > On Wed, Apr 13,

Re: [PATCH] t1500-rev-parse: rewrite each test to run in isolation

On Wed, Apr 13, 2016 at 12:54 AM, Eric Sunshine wrote: > On Sat, Apr 9, 2016 at 7:19 AM, Michael Rappazzo wrote: >> t1500-rev-parse has many tests which change directories and leak >> environment variables. This makes it difficult to add new tests

Re: [PATCH] gitk: Fix how remote branch names with / are drawn

On Tue, Apr 12, 2016 at 9:59 PM, David Holmer wrote: > Consider this example branch: > > remotes/origin/master > > gitk displays this branch with different background colors for each part: > "remotes/origin" in orange and "master" in green. The idea is to make it > visually

Re: [PATCH] rev-parse: fix --git-common-dir when executed from subpath of main tree

On Fri, Apr 8, 2016 at 7:47 AM, Duy Nguyen wrote: > On Mon, Apr 4, 2016 at 8:42 AM, Michael Rappazzo wrote: >> Executing `git-rev-parse --git-common-dir` from the root of the main >> worktree results in '.git', which is the relative path to the git dir. >>

[Bug] git rev-parse --git-common-dir executed from a sub dir of the main worktree is wrong

I found a case where it seems that the result of `git rev-parse --git-common-dir` is incorrect. If you execute the command from within a subdirectory in the main worktree, it returns the path from the root of the worktree to the current dir + "/.git". (As a refresher, running this command from

Re: [PATCH v2] worktree: add: introduce --checkout option

On Fri, Mar 25, 2016 at 7:41 AM, Duy Nguyen wrote: > On Fri, Mar 25, 2016 at 6:31 PM, Zhang Lei wrote: >> By the way, Duy, another unrelated question: why worktree name under >> .git/worktrees is being named >> after the working tree path basename? I

Re: [PATCH v3 0/3] config: add '--sources' option to print the source of a config value

On Sat, Feb 13, 2016 at 9:24 AM, wrote: > From: Lars Schneider > > diff to v2: > * rename cmd to cmdline > * rename function current_config_name to current_config_type_name > * add 'type' to config_source struct that identifies config type > *

Re: [PATCH] show signature of commit in gitk

On Sun, Dec 13, 2015 at 9:15 AM, Daniel Fahlke wrote: > It seems my Patch got no attention yet, is there anything wrong? > Do I need to ping someone in particular? > gitk patches should cc +Paul Mackerras who maintains gitk -- To unsubscribe from this

Re: [PATCH 0/5] ff-refs: builtin command to fast-forward local refs

On Tue, Nov 17, 2015 at 10:28 AM, Michael J Gruber <g...@drmicha.warpmail.net> wrote: > Mike Rappazzo venit, vidit, dixit 17.11.2015 14:58: > > I still don't like the idea of having a new command just for the purpose > of fast-forwarding local branches from specified upstreams

Re: [PATCH 0/5] ff-refs: builtin command to fast-forward local refs

On Wed, Nov 11, 2015 at 5:41 AM, Michael J Gruber wrote: > Michael Rappazzo venit, vidit, dixit 11.11.2015 03:11: >> This patch series is built on (based on) 'next' because it relies on >> worktree.c >> >> `ff-refs` will update local branches which can be fast-forwarded

Re: [BUG] Wrong worktree path when using multiple worktree

On Tue, Nov 3, 2015 at 11:58 AM, Nicolas Morey-Chaisemartin wrote: > Hi, > > There seem to be an issue with the path computed for a worktree when multiple > worktree were created (using git worktree) > In my Setup, I have 3 repos: > A/repo (main One) >

Re: [BUG] Wrong worktree path when using multiple worktree

On Tue, Nov 3, 2015 at 5:27 PM, Mike Rappazzo <rappa...@gmail.com> wrote: > On Tue, Nov 3, 2015 at 11:58 AM, Nicolas Morey-Chaisemartin > <nico...@morey-chaisemartin.com> wrote: >> Hi, >> >> There seem to be an issue with the path computed for a worktree whe

Re: What's the ".git/gitdir" file?

On Tue, Oct 27, 2015 at 6:54 PM, Junio C Hamano wrote: > Kyle Meyer writes: > >> When a ".git" file points to another repo, a ".git/gitdir" file is >> created in that repo. >> >> For example, running >> >> $ mkdir repo-a repo-b >> $ cd repo-a >> $

Re: How to rebase when some commit hashes are in some commit messages

On Tue, Oct 13, 2015 at 1:07 PM, Jacob Keller wrote: > On Tue, Oct 13, 2015 at 6:29 AM, Philip Oakley wrote: >> My tuppence is that the only sha1's that could/would be rewritten would be >> those for the commits within the rebase. During rebasing it

Re: What's cooking in git.git (Oct 2015, #01; Mon, 5)

On Tue, Oct 6, 2015 at 1:55 AM, Junio C Hamano wrote: > Torsten Bögershausen writes: > >> Minor comment from my compiler: >> >> worktree.c:181: warning: assuming signed overflow does not occur when >> assuming >> that (X + c) > X is always true > > Thanks; I

Re: Convenient shortcut to push delete current branch?

On Thu, Oct 1, 2015 at 2:37 PM, Robert Dailey wrote: > On Thu, Oct 1, 2015 at 1:22 PM, Jacob Keller wrote: >> On Thu, Oct 1, 2015 at 9:43 AM, Robert Dailey >> wrote: >>> For convenient pushing of current branch, git

Re: can't install on OS X

Looks like you have it installed properly. The typical usage is from the terminal, (try `git --version` to be sure). There is also a pretty great UI packaged with git called git-gui. You should be able to make a link or an alias to it in your Applications folder (or invoke it from the terminal

Re: [PATCH v8 4/4] worktree: add 'list' command

On Tue, Sep 22, 2015 at 3:42 PM, Junio C Hamano wrote: > Michael Rappazzo writes: > >> >> +--porcelain:: >> + With `list`, output in an easy-to-parse format for scripts. >> + This format will remain stable across Git versions and regardless of >>

Re: [PATCH v7 1/3] worktree: add top-level worktree.c

On Wed, Sep 16, 2015 at 4:32 PM, Eric Sunshine <sunsh...@sunshineco.com> wrote: > On Mon, Sep 14, 2015 at 8:20 AM, Mike Rappazzo <rappa...@gmail.com> wrote: >> On Sat, Sep 12, 2015 at 10:39 PM, Eric Sunshine <sunsh...@sunshineco.com> >> wrote: >>>&g

Re: [PATCH v7 2/3] worktree: move/refactor find_shared_symref from branch.c

On Wed, Sep 16, 2015 at 5:09 PM, Eric Sunshine <sunsh...@sunshineco.com> wrote: > On Mon, Sep 14, 2015 at 1:44 PM, Mike Rappazzo <rappa...@gmail.com> wrote: >> On Sat, Sep 12, 2015 at 11:19 PM, Eric Sunshine <sunsh...@sunshineco.com> >> wrote: >>> On Fri

Re: [PATCH v7 1/3] worktree: add top-level worktree.c

On Sat, Sep 12, 2015 at 10:39 PM, Eric Sunshine wrote: > I realize that this is modeled closely after existing code in > branch.c, but, with the exception of parsing the ref file and > constructing a worktree structure, the main worktree case (id == NULL) > is entirely

Re: [PATCH v7 2/3] worktree: move/refactor find_shared_symref from branch.c

On Sat, Sep 12, 2015 at 11:19 PM, Eric Sunshine wrote: > On Fri, Sep 4, 2015 at 5:39 PM, Michael Rappazzo wrote: >> The code formerly in branch.c was largely the basis of the >> get_worktree_list implementation is now moved to worktree.c, >> and the

Re: [PATCH v7 2/3] worktree: move/refactor find_shared_symref from branch.c

On Fri, Sep 11, 2015 at 12:16 PM, Junio C Hamano wrote: > Michael Rappazzo writes: > >> The code formerly in branch.c was largely the basis of the >> get_worktree_list implementation is now moved to worktree.c, >> and the find_shared_symref implementation

Re: [PATCH v7 1/3] worktree: add top-level worktree.c

On Thu, Sep 10, 2015 at 4:04 PM, Junio C Hamano wrote: > Michael Rappazzo writes: > >> Including functions to get the list of all worktrees, and to get >> a specific worktree (primary or linked). > > Was this meant as a continuation of the sentence started

Re: [PATCH v7 2/3] worktree: move/refactor find_shared_symref from branch.c

On Fri, Sep 11, 2015 at 7:10 PM, Eric Sunshine wrote: > On Fri, Sep 11, 2015 at 5:52 PM, Junio C Hamano wrote: > > Thanks for bringing this up. I haven't found a sufficient block of > time yet to review these patches, however, I had the same thought

Re: [PATCH v6 1/2] worktree: add 'for_each_worktree' function

On Mon, Aug 31, 2015 at 1:11 AM, Eric Sunshine wrote: > Thanks for working on this. I apologize for not reviewing earlier > rounds (other than v2 [1]); it's been difficult to find a block of > time to do so... I appreciate your time and comments. > > On Sun, Aug 30,

Re: [PATCH v6 1/2] worktree: add 'for_each_worktree' function

On Mon, Aug 31, 2015 at 3:47 PM, Eric Sunshine <sunsh...@sunshineco.com> wrote: > On Mon, Aug 31, 2015 at 2:57 PM, Mike Rappazzo <rappa...@gmail.com> wrote: >> I wasn't sure that a bare repo would be considered a worktree. I >> don't think that it would b

Re: [PATCH 1/2 v4] worktree: add 'for_each_worktree' function

I will reroll this series with adjustments as you suggested, and I will add the extra tests for bare repos. On Thu, Aug 13, 2015 at 3:23 PM, David Turner dtur...@twopensource.com wrote: The scope of d can be smaller; move it down to the place I've marked below I have adjusted the scoping. I

Re: [PATCH v3] worktree: add 'list' command

On Mon, Aug 10, 2015 at 6:10 PM, Junio C Hamano gits...@pobox.com wrote: Michael Rappazzo rappa...@gmail.com writes: +static int list(int ac, const char **av, const char *prefix) +{ + int main_only = 0; + struct option options[] = { + OPT_BOOL(0, main-only, main_only,

Re: [PATCH v3] worktree: add 'list' command

On Mon, Aug 10, 2015 at 10:55 PM, David Turner dtur...@twopensource.com wrote: On Mon, 2015-08-10 at 16:53 -0400, Michael Rappazzo wrote: + while ((d = readdir(dir)) != NULL) { I think it would be useful to break this loop out into a for_each_worktree function. While

Re: [PATCH] worktree: list operation

Withdrawn -- I staged but did not amend the final commit. I will adjust and resend. On Sat, Aug 8, 2015 at 4:34 PM, Michael Rappazzo rappa...@gmail.com wrote: 'git worktree list' will list the main worktree followed by any linked worktrees which were created using 'git worktree add'. The

Re: git send-email Connection Closed

I believe that this is due to gmail not allowing the email. I think there are two ways to fix this: 1. Temporarily enable less secure apps for your gmail account while you send the email [see here](https://support.google.com/accounts/answer/6010255?hl=en). 2. Setup multi-factor authentication

Re: [PATCH] mergetools: add config option to disable auto-merge

On Thu, Jun 18, 2015 at 4:43 AM David Aguilar dav...@gmail.com wrote: On Wed, Jun 17, 2015 at 10:27:58PM -0400, Mike Rappazzo wrote: I feel that the auto-merge takes away the context of the changes. I use araxis merge as my mergetool of choice. I almost always immediately undo

Re: [PATCH] mergetools: add config option to disable auto-merge

On Wed, Jun 17, 2015 at 3:41 PM, Junio C Hamano gits...@pobox.com wrote: Michael Rappazzo rappa...@gmail.com writes: For some mergetools, the current invocation of git mergetool will include an auto-merge flag. By default the flag is included, however if the git config option

Re: [PATCH v4] git-rebase--interactive.sh: add config option for custom instruction format

On Fri, Jun 12, 2015 at 6:05 PM, Junio C Hamano gits...@pobox.com wrote: But because you overwrite the $message variable you read from the original insn sheet (which uses the custom format) and compute $rest based on the default %s and store that in $1.sq, lines in $1.sq do not know anything

Re: [PATCH v4] git-rebase--interactive.sh: add config option for custom instruction format

It only needs the '%s' for the autosquash when the todo/instruction list order is determined. For this, in the rearrange_squash function, it will re-calculate the message: + test -z ${format} || message=$(git log -n 1 --format=%s ${sha1}) Additionally, it may also rerun the log

Re: [PATCH] git-rebase--interactive.sh: add config option for custom instruction format

On Thu, Jun 11, 2015 at 9:40 AM, Johannes Schindelin johannes.schinde...@gmx.de wrote: Hi Michael, On 2015-06-11 03:30, Michael Rappazzo wrote: diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index dc3133f..6d14315 100644 --- a/git-rebase--interactive.sh +++

Re: [PATCH v2] git-rebase--interactive.sh: add config option for custom instruction format

I see your point, and I'll explore that avenue. Personally, I like the idea that one could also use the short hash if the custom instruction started with %h , but I see the value in leaving the variable blank. After running the tests with a custom format enabled, I did find that autosquash

Re: [PATCH v2] git-rebase--interactive.sh: add config option for custom instruction format

I have since reworked this script to support the short hash in the custom format as a special case: -git rev-list $merges_option --pretty=oneline --reverse --left-right --topo-order \ +format=$(git config --get rebase.instructionFormat) +no_format=$? +if test ${no_format} -ne 0 +then + format=%H

Re: [PATCH] git-rebase--interactive.sh: add config option for custom

On Mon, Jun 8, 2015 at 11:28 AM, Junio C Hamano gits...@pobox.com wrote: Michael Rappazzo rappa...@gmail.com writes: A config option 'rebase.instructionFormat' can override the default 'oneline' format of the rebase instruction list. Since the list is parsed using the left, right or boundary

Suggestion: add author info to TODO list in git-rebase--interactive

I find that If I am doing a rebase with the intention to squash or re-order commits, it is helpful to know the commit author. However, the alteration that I have made to git-rebase--interactive may not be entirely correct. Here is the change: --- diff --git a/git-rebase--interactive.sh

Re: Suggestion: add author info to TODO list in git-rebase--interactive

to what you are looking for? I also tried changing the '--left-right' to '--left-only', but that seemed to not produce any results. On Fri, Jun 5, 2015 at 3:39 PM, Eric Sunshine sunsh...@sunshineco.com wrote: On Fri, Jun 5, 2015 at 3:35 PM, Junio C Hamano gits...@pobox.com wrote: Mike Rappazzo