From: Ben Woosley
To avoid partial deletion / zombie rebases.
Example behavior under partial deletion, after
Ctrl-Cing out of a standard rebase:
$ git rebase target
First, rewinding head to replay your work on top of it...
Applying: [...]
^C
$ git status
rebase in progre
Send the photos to start editing.
We can do white background for your photos, can add clipping path if
needed.
We can also sharpen your photos also give retouching.
If you have the photos ready, please send a test photo to start.
Thanks,
Carol
On Sat, Jan 26, 2019 at 12:05:08AM +0100, Ævar Arnfjörð Bjarmason wrote:
>
> On Fri, Jan 25 2019, William Hubbs wrote:
...
> > + sane_unset GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL &&
> > + sane_unset GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL &&
>
> Fine, but FYI sets these variables for the rest of t
git describe --dirty shows dirty when cwd not repo work directory.
Confirmed by osse on freenode irc #git
ubuntu@wrk:~/tmp$ pwd
/home/ubuntu/tmp
ubuntu@wrk:~/tmp$ git clone https://github.com/ipfs/go-ipfs.git
ubuntu@wrk:~/tmp$ GIT_DIR=/home/ubuntu/tmp/go-ipfs/.git
GIT_WORK_TREE=/home/ubun
On Fri, Jan 25, 2019 at 05:22:45PM +0200, Arti Zirk wrote:
> This is the built in http server that Python comes with (like Ruby
> users have builtin webrick server). While it is possible to install
> something else, I don't think many casual git-instaweb users would do
> it.
>
> I haven't looked
On 2019.01.24 13:51, Derrick Stolee via GitGitGadget wrote:
> The multi-pack-index provides a fast way to find an object among a large
> list of pack-files. It stores a single pack-reference for each object id, so
> duplicate objects are ignored. Among a list of pack-files storing the same
> object
On 2019.01.24 13:51, Derrick Stolee via GitGitGadget wrote:
> From: Derrick Stolee
>
> In an environment where the multi-pack-index is useful, it is due
> to many pack-files and an inability to repack the object store
> into a single pack-file. However, it is likely that many of these
> pack-file
On Fri, Jan 25 2019, William Hubbs wrote:
> Signed-off-by: William Hubbs
> ---
> t/t7517-per-repo-email.sh | 17 +
> 1 file changed, 17 insertions(+)
>
> diff --git a/t/t7517-per-repo-email.sh b/t/t7517-per-repo-email.sh
> index 231b8cc19d..06c7c0fb78 100755
> --- a/t/t7517-per
On Fri, Jan 25 2019, William Hubbs wrote:
> The author.email, author.name, committer.email and committer.name
> settings are analogous to the GIT_AUTHOR_* and GIT_COMMITTER_*
> environment variables, but for the git config system. This allows them
> to be set separately for each repository.
>
>
Elijah Newren writes:
> Also, my first version of the patch actually showed all names, on all
> lines, but I found the heavy repetition really annoying, and not in
> keeping with how non-merge commits are handled (where original
> filenames are only shown when they differ). Granted, my change is
On Fri, Jan 25, 2019 at 11:14:14PM +0100, SZEDER Gábor wrote:
> On Fri, Jan 25, 2019 at 11:56:38AM -0800, Stefan Beller wrote:
> > > Have fun! :)
> >
> > $ git gc
> > ...
> > Computing commit graph generation numbers: 100% (164264/164264), done.
> > $ ./git version
> > git version 2.20.1.775.g2313
On Fri, Jan 25, 2019 at 11:56:38AM -0800, Stefan Beller wrote:
> > Have fun! :)
>
> $ git gc
> ...
> Computing commit graph generation numbers: 100% (164264/164264), done.
> $ ./git version
> git version 2.20.1.775.g2313a6b87fe.dirty
> # pu + one commit addressing
> #
> https://public-inbox.org/g
> > Have fun! :)
>
> $ git gc
> ...
> Computing commit graph generation numbers: 100% (164264/164264), done.
> $ ./git version
> git version 2.20.1.775.g2313a6b87fe.dirty
> # pu + one commit addressing
> #
> https://public-inbox.org/git/cagz79kaug3ntrpri5mlk6ag87idb_ltq_keilwz2hgz+-vs...@mail.gma
The author.email, author.name, committer.email and committer.name
settings are analogous to the GIT_AUTHOR_* and GIT_COMMITTER_*
environment variables, but for the git config system. This allows them
to be set separately for each repository.
Git supports setting different authorship and committer
All,
this is a re-roll of my previous patch to add separate author and
committer settings.:s/committer/committer configuration/
A
I attempted to encorporate everything from the last iteration, and all
tests still pass.
This applies to master. Please review.
[PATCH v2 1/2] config: allow giving s
Signed-off-by: William Hubbs
---
t/t7517-per-repo-email.sh | 17 +
1 file changed, 17 insertions(+)
diff --git a/t/t7517-per-repo-email.sh b/t/t7517-per-repo-email.sh
index 231b8cc19d..06c7c0fb78 100755
--- a/t/t7517-per-repo-email.sh
+++ b/t/t7517-per-repo-email.sh
@@ -85,4 +85,
Nguyễn Thái Ngọc Duy writes:
> I have a remote named "jch" and it has a branch with the same name. And
> fetch.output is set to "compact". Fetching this remote looks like this
>
> From https://github.com/gitster/git
> + eb7fd39f6b...835363af2f jch-> */jch (forced update)
>
"Israel, Daniel M" writes:
> I need a custom merge strategy (not driver) for a tool I’m writing, and I’m
> wondering:
>
> 1. Is there documentation for the API anywhere?
It used to be far easier to figure out back when git-merge.sh was a
script before 1c7b76be ("Build in merge", 2008-07-07) and
On 1/23/2019 3:51 PM, Junio C Hamano wrote:
"Jeff Hostetler via GitGitGadget" writes:
+These high-level events are written to one or more Trace2 Targets
+in a target-specific format. Each Trace2 Target defines a different
+purpose-specific view onto the event data stream. In this mannor,
On Fri, Jan 25, 2019 at 11:29 AM Junio C Hamano wrote:
>
> Elijah Newren writes:
>
> > The raw diff format for merges with -c or --cc will only list one
> > filename, even if rename detection is active and a rename was detected
> > for the given path. Examples:
> >
> > ::100644 100644 100644 f
On 2019.01.22 13:22, Jeff Hostetler via GitGitGadget wrote:
> This patch series contains a greatly refactored version of my original
> Trace2 series [1] from August 2018.
>
> A new design doc in Documentation/technical/api-trace2.txt (in the first
> commit) explains the relationship of Trace2 to t
> Have fun! :)
$ git gc
...
Computing commit graph generation numbers: 100% (164264/164264), done.
$ ./git version
git version 2.20.1.775.g2313a6b87fe.dirty
# pu + one commit addressing
#
https://public-inbox.org/git/cagz79kaug3ntrpri5mlk6ag87idb_ltq_keilwz2hgz+-vs...@mail.gmail.com/
$ ./git -c
On Fri, Jan 25, 2019 at 12:52 PM Elijah Newren wrote:
> On Fri, Jan 25, 2019 at 9:41 AM Derrick Stolee wrote:
> > On 1/25/2019 11:54 AM, Elijah Newren wrote:
> > > + printf "0f9645804ebb04cc3eef91f799eb7fb54d70cefb\0::100644 100644
> > > 100644 f00c965d8307308469e537302baa73048488f162
> > >
On Fri, Jan 25, 2019 at 08:24:35PM +0100, Martin Ågren wrote:
> On Wed, 23 Jan 2019 at 06:57, Jeff King wrote:
> >
> > On Tue, Jan 22, 2019 at 10:45:48PM +0100, Martin Ågren wrote:
> >
> > > Call `clear_...()` at the start of `read_...()` instead of just zeroing
> > > the struct, since we sometim
I see it is fixed in
https://public-inbox.org/git/20190122003020.9672-3-pclo...@gmail.com/
but not in 2722d068deb (SQUASH???, 2019-01-18)
Elijah Newren writes:
> The raw diff format for merges with -c or --cc will only list one
> filename, even if rename detection is active and a rename was detected
> for the given path. Examples:
>
> ::100644 100644 100644 fabadb8 cc95eb0 4866510 MM describe.c
> ::100755 100755 100755 52b7a
On Thu, 24 Jan 2019 at 01:15, brian m. carlson
wrote:
>
> On Wed, Jan 23, 2019 at 12:57:05AM -0500, Jeff King wrote:
> > > +void clear_repository_format(struct repository_format *format)
> > > +{
> > > + string_list_clear(&format->unknown_extensions, 0);
> > > + free(format->work_tree);
> > >
On Wed, 23 Jan 2019 at 06:57, Jeff King wrote:
>
> On Tue, Jan 22, 2019 at 10:45:48PM +0100, Martin Ågren wrote:
>
> > Call `clear_...()` at the start of `read_...()` instead of just zeroing
> > the struct, since we sometimes enter the function multiple times. This
> > means that it is important t
SZEDER Gábor writes:
>> +if (ctx->nr_open_regions > 0) {
>> +int len_indent = TR2_INDENT_LENGTH(ctx);
>> +while (len_indent > dots.len) {
>> +strbuf_addf(buf, "%s", dots.buf);
>
> Please use the much simpler are more idiomatic strbuf_addbuf()
> func
On Wed, Jan 23, 2019 at 09:54:25AM -0800, Junio C Hamano wrote:
> Torsten Bögershausen writes:
>
> >> I'd still prefer to see a more terse[1] (and not capitalized) message
> >> to be consistent with existing error messages and to keep the reported
> >> errors more compact overall to make them easi
On 2019.01.25 14:19, SZEDER Gábor wrote:
> On Tue, Jan 22, 2019 at 01:22:12PM -0800, Jeff Hostetler via GitGitGadget
> wrote:
> > From: Jeff Hostetler
> >
> > Created design document for Trace2 feature.
> >
> > Signed-off-by: Jeff Hostetler
> > ---
> > Documentation/technical/api-trace2.txt |
On Fri, Jan 25, 2019 at 9:41 AM Derrick Stolee wrote:
>
> On 1/25/2019 11:54 AM, Elijah Newren wrote:
> > +test_expect_success '--combined-with-paths works with -z as well' '
> > + printf "0f9645804ebb04cc3eef91f799eb7fb54d70cefb\0::100644 100644
> > 100644 f00c965d8307308469e537302baa7304848
On 1/25/2019 11:54 AM, Elijah Newren wrote:
> +test_expect_success '--combined-with-paths works with -z as well' '
> + printf "0f9645804ebb04cc3eef91f799eb7fb54d70cefb\0::100644 100644
> 100644 f00c965d8307308469e537302baa73048488f162
> 088bd5d92c2a8e0203ca8e7e4c2a5c692f6ae3f7
> 333b9c62519f
Bump x 2
Still seeking anyone that understands the logic behind how "reference"
works across multiple commands.
Thanks!
- Bret
On Sat, Jan 19, 2019 at 10:38 AM Bret Barkelew wrote:
>
> Bump.
>
> We really do need to figure this out. Anyone familiar with the
> behavior of “reference”?
>
> Thanks
The raw diff format for merges with -c or --cc will only list one
filename, even if rename detection is active and a rename was detected
for the given path. Examples:
::100644 100644 100644 fabadb8 cc95eb0 4866510 MM describe.c
::100755 100755 100755 52b7a2d 6d1ac04 d2ac7d7 RM bar.sh
Hi,
On Fri, Jan 25, 2019 at 6:45 AM Derrick Stolee wrote:
>
> On 1/24/2019 11:46 AM, Elijah Newren wrote:
> > As an alternative, I considered perhaps trying to sell it as a bugfix
> > (how often do people use -M, -c, and --raw together and have renames
> > in merge commits -- can I just change th
Hi,
On Thu, Jan 24, 2019 at 6:19 PM brian m. carlson
wrote:
>
> On Thu, Jan 24, 2019 at 08:46:54AM -0800, Elijah Newren wrote:
> > The critical part of the patch is the few line change to
> > show_raw_diff(), the rest is plumbing to set that up.
> >
> > This patch was based out of Peff's suggesti
On Tue, Dec 04, 2018 at 02:42:38PM -0800, Jonathan Tan wrote:
> When fetching into a repository, a connectivity check is first made by
> check_exist_and_connected() in builtin/fetch.c that runs:
>
> git rev-list --objects --stdin --not --all --quiet <(list of objects)
>
> If the client reposito
> > Could we call this "python3" instead, or provide some other way to
> > communicate this to the user?
>
> Sounds like a good idea. Also would this be _the_ sole http server
> implementation Python3 users would choose, or is it just a possible
> one? What I am trying to get at is that we mig
On 1/24/2019 11:46 AM, Elijah Newren wrote:
> As an alternative, I considered perhaps trying to sell it as a bugfix
> (how often do people use -M, -c, and --raw together and have renames
> in merge commits -- can I just change the format to include the old
> names), but was worried that since diff-
"brian m. carlson" writes:
> I'm glad we're using Python 3 here, but I wonder if the name "python"
> will lead people to think it will work with Python 2 as well. There are
> people using up-to-date Git on systems like CentOS 6 and 7, where Python
> 3 is not generally available.
>
> Could we call
In a script of mine I want to describe HEAD without changing the
current directory, so I specify --git-dir and --work-tree. But it
appears the --dirty check doesn't consider the --work-tree value.
Here's a simplified example (on macOS 10.14.1):
$ git version
git version 2.20.1
$ mkdir test
$ cd t
On 1/24/2019 6:39 PM, Junio C Hamano wrote:
> "Derrick Stolee via GitGitGadget" writes:
>
>> This series is based on ab/commit-graph-write-progress and bc/sha-256.
>
> Thanks.
>
> It seems that the base (i.e. merge between these two topics) you
> used may have used a version of either topic (mo
On Wed, Jan 23, 2019 at 06:40:16AM -0800, Johannes Schindelin via GitGitGadget
wrote:
> From: Johannes Schindelin
>
> The upcoming patches will allow building git.git via Azure Pipelines
> (i.e. Azure DevOps' Continuous Integration), where variable names and
> URLs look a bit different than in T
On Wed, Jan 23, 2019 at 02:22:10PM -0800, Junio C Hamano wrote:
> "Johannes Schindelin via GitGitGadget"
> writes:
>
> > From: Johannes Schindelin
> >
> > Let's not decide in the generic ci/ script how many jobs to run in
> > parallel; it is easy enough to hand that information down via the
> >
On Tue, Jan 22, 2019 at 01:22:12PM -0800, Jeff Hostetler via GitGitGadget wrote:
> From: Jeff Hostetler
>
> Created design document for Trace2 feature.
>
> Signed-off-by: Jeff Hostetler
> ---
> Documentation/technical/api-trace2.txt | 1158
> 1 file changed, 1158 inser
Hi Peff,
On Thu, 24 Jan 2019, Jeff King wrote:
> On Tue, Jan 22, 2019 at 12:23:55PM -0800, Junio C Hamano wrote:
>
> > Johannes Schindelin writes:
> >
> > >> +sha1_abbr_src=$(GIT_DIR="$name/.git" git rev-parse
> > >> --short $sha1_src)
> > >
> > > How about `git -C "$name" rev
Hi Phillip,
Sorry for omitting you in Cc, again.
I accidentally wrote yours and Ævar's email prefixed with Cc:, rather
then separating
them with comma, like Johannes said I should.
-Slavica
On 25-Jan-19 1:23 PM, Slavica Đukić via GitGitGadget wrote:
This is the first version of a patch serie
The best way to add one strbuf to an other is via:
strbuf_addbuf(&sb, &sb2);
This is a bit more idiomatic and efficient than:
strbuf_addstr(&sb, sb2.buf);
because the size of the second strbuf is known and thus it can spare a
strlen() call, and much more so than:
strbuf_addf(&sb, "%s", s
From: Slavica Djukic
Change help_cmd sub in git-add--interactive.perl to use
show-help command from builtin add--helper.
If an error occurs, it will be reported, but the Perl script will
not exit, since the add--helper is called within an eval block.
Just like the change where the Perl script c
From: Daniel Ferreira
Make the diffstat interface (namely, the diffstat_t struct and
compute_diffstat) no longer be internal to diff.c and allow it to be used
by other parts of git.
This is helpful for code that may want to easily extract information
from files using the diff machinery, while fl
From: Daniel Ferreira
Add new files: add-interactive.c and add-interactive.h, which
will be used for implementing "application logic" of git add -i,
whereas add--helper.c will be used mostly for parsing the command line.
We're a bit lax with the command-line parsing, as the command is
intended to
From: Slavica Djukic
Implement show-help command in add-interactive.c and use it in
builtin add--helper.c.
Use command name "show-help" instead of "help": add--helper is
builtin, hence add--helper --help would be intercepted by
handle_builtin and re-routed to the help command, without ever
calli
From: Daniel Ferreira
Create a builtin helper for git-add--interactive, which right now is not
able to do anything.
This is the first step in an effort to convert git-add--interactive.perl
to a C builtin, in search for better portability, expressibility and
performance (specially on non-POSIX sy
From: Daniel Ferreira
Call the newly introduced add--helper builtin in
status_cmd() instead of relying on add--interactive's Perl
functions to print the numstat.
If an error occurs, it will be reported, but the Perl script will
not exit, since the add--helper is called within an eval block.
As
This is the first version of a patch series to start porting
git-add--interactive from Perl to C. Daniel Ferreira's patch series used as
a head start:
https://public-inbox.org/git/1494907234-28903-1-git-send-email-bnm...@gmail.com/t/#u
Changes since v3:
* add error check when calling add--helper
From: Slavica Djukic
Add test to t3701-add-interactive to verify that add_i_show_help()
outputs expected content.
Also, add it before changing git-add--interactive.perl's help_cmd
to demonstrate that there are no changes introduced by the
conversion to C.
Prefix git add -i call with GIT_PAGER_IN
Hi Phillip,
On 25-Jan-19 12:01 PM, Phillip Wood wrote:
Hi Slavica
Having suggested that you move this patch up the series, I thought I
should check that it does actually pass before the rewrite.
Unfortunately when I run it it fails, but it is due to a missing
trailing space in the expected file
On Fri, Jan 25, 2019 at 12:47:35PM +0300, Furkan DURUL wrote:
> Hello,
> My name is Furkan. I'm a new graduated Electronics and Communication
> Engineer in Turkey. In my current workplace, we use Git in all our
> projects and I really learned a lot from your Pro Git Book. I would
> like to contribu
On Tue, Jan 22, 2019 at 01:22:14PM -0800, Jeff Hostetler via GitGitGadget wrote:
> diff --git a/trace2/tr2_tgt_perf.c b/trace2/tr2_tgt_perf.c
> new file mode 100644
> index 00..035855d883
> --- /dev/null
> +++ b/trace2/tr2_tgt_perf.c
> @@ -0,0 +1,573 @@
> +static struct strbuf dots = STRBU
Hi Slavica
Having suggested that you move this patch up the series, I thought I
should check that it does actually pass before the rewrite.
Unfortunately when I run it it fails, but it is due to a missing
trailing space in the expected file. I get
--- expect 2019-01-25 10:42:06.794251740 +00
I have a remote named "jch" and it has a branch with the same name. And
fetch.output is set to "compact". Fetching this remote looks like this
From https://github.com/gitster/git
+ eb7fd39f6b...835363af2f jch-> */jch (forced update)
6f11fd5edb..59b12ae96a nd/config-move-to
Hello,
My name is Furkan. I'm a new graduated Electronics and Communication
Engineer in Turkey. In my current workplace, we use Git in all our
projects and I really learned a lot from your Pro Git Book. I would
like to contribute to translation of this book to Turkish. I'm also a
freelance translat
On Fri, Jan 25, 2019 at 9:26 AM Jonathan Nieder wrote:
>
> Junio C Hamano wrote:
> > Jonathan Nieder writes:
>
> >> I find --ignore-removal fairly easy to understand, and I had no idea
> >> what --overlay would mean.
> >>
> >> I realize this is just one user's experience.
> >
> > Exactly. My imp
64 matches
Mail list logo
