Junio C Hamano writes:
>> +int git_config(config_fn_t fn, void *data)
>> +{
>> +git_config_check_init();
>> +return configset_iter(&the_config_set, fn, data);
>> +}
>
> Perhaps if you define this function at the right place in the file
> you do not have to add an forward decl of git_confi
Junio C Hamano writes:
> in my ~/.gitconfig and then for a particular project I wanted to use
> a custom pattern in its .git/config but it was sufficient to define
> the pattern without using extended regexp, I would be tempted to say
>
> diff.foo.funcname "Wine$"
The point is: to do that,
When parsing "index" lines from a git-diff, we look for a
space followed by the mode. If we don't have a space, then
we set our pointer to the end-of-line. However, we don't
double-check that our end-of-line pointer is valid (e.g., if
we got a truncated diff input), which could lead to some
wrap-ar
When we see the core.commentchar config option, we extract
the string with git_config_string, which does two things:
1. It complains via config_error_nonbool if there is no
string value.
2. It makes a copy of the string.
Since we immediately parse the string into its
single-character va
A call to "dwim_ref(name, len, flags, &ref)" will allocate a
new string in "ref" to return the exact ref we found. We do
not consistently free it in all code paths, leading to small
leaks. The worst is in get_sha1_basic, which may be called
many times (e.g., by "cat-file --batch"), though it is
rel
The function starts by creating a copy of the static buffer
returned by real_path, but forgets to free it in the error
code paths. We can solve this by jumping to the cleanup code
that is already there.
Signed-off-by: Jeff King
---
transport.c | 5 +++--
1 file changed, 3 insertions(+), 2 deleti
We used to do this so could pass a mutable string to
enter_repo. But since 1c64b48 (enter_repo: do not modify
input, 2011-10-04), this is not necessary.
The resulting code is simpler, and it fixes a minor leak.
Signed-off-by: Jeff King
---
If you are wondering whether upload-pack needs the same
Since Stefan has recently started feeding git builds to coverity, I
spent a few minutes poking through the results. There are tons of false
positives, so there is some work to be done there with tweaking our
coverity models. But there are some real issues, too. Here are fixes for
the handful that I
On Wed, 2014-07-23 at 16:51 -0700, Junio C Hamano wrote:
> Ross Boylan writes:
>
> >> Either
> >>
> >>git fetch origin master:refs/remotes/origin/master
> > Great; that works.
> > Is that procedure supposed to be the usual way I track upstream in this
> > (1.7) version of git? It seems arca
Ross Boylan writes:
>> Either
>>
>> git fetch origin master:refs/remotes/origin/master
> Great; that works.
> Is that procedure supposed to be the usual way I track upstream in this
> (1.7) version of git? It seems arcane.
No, and no. The command is designed so that most of the time you
On Wed, 2014-07-23 at 14:41 -0700, Junio C Hamano wrote:
> Ross Boylan writes:
>
> > I still don't know what I need to do to update origin/master in my local
> > repo.
> >
> > Regarding Kevin's suggestion, I just tried "git fetch origin master".
>
> I think Kevin's suggestion was 'To older git,
Ronnie Sahlberg writes:
> This is the next patch series for ref-transactions.
> It is also available at
>
> https://github.com/rsahlberg/git/tree/ref-transactions-reflog
>
> and is the same patch series that has been posted previously with one
> exception:
I've received, queued and started read
ml.christophbon...@gmail.com wrote on Wed, 23 Jul 2014 23:28 +0200:
> The scenario in the rename test makes unnecessary assumptions about
> which file git file-tree will detect as a source for a copy-operations.
> Furthermore, copy detection is not tested by checking the resulting
> perforce revisi
Ronnie Sahlberg writes:
> Signed-off-by: Ronnie Sahlberg
> ---
> refs.c | 18 ++
> refs.h | 7 ---
> 2 files changed, 6 insertions(+), 19 deletions(-)
>
> diff --git a/refs.c b/refs.c
> index 6dcb920..8f2aa3a 100644
> --- a/refs.c
> +++ b/refs.c
> @@ -3490,28 +3490,14 @@ in
Tanay Abhra writes:
> t4018-diff-funcname.sh fails for the new `git_config()` which uses the
> configuration files caching layer internally.
> The test introduced in commit d64d6cdc checks that whether `xfuncname` takes
> precedence over `funcname` variable which was not guaranteed by config API
Monard Vong wrote:
> If a client certificate is required to connect to svn, "git svn branch"
> always prompt the user for the certificate location and password,
> even though those parameters are stored in svn file "server"
> located in svn config dir (generally ~/.subversion).
> On the opposite,
Tanay Abhra writes:
> @@ -1287,6 +1300,8 @@ static struct config_set_element
> *configset_find_element(struct config_set *cs,
> static int configset_add_value(struct config_set *cs, const char *key, const
> char *value)
> {
> struct config_set_element *e;
> + struct key_value_info *
Matthieu Moy writes:
> Tanay Abhra writes:
>
>> +test_expect_success 'check line errors for malformed values' '
>> +cp .git/config .git/config.old &&
Should this be "mv" not "cp"? You will be overwriting the file from
scratch in the later part of this test.
>> +test_when_finished "mv
Andrej Manduch wrote:
> * this fixes 'git svn info `pwd`' buggy behaviour
Good catch, the commit could use a better description, something like:
--- 8<
Subject: [PATCH] git-svn: "info" checks for dirs more carefully
This avoids a "Reading from
Tanay Abhra writes:
> Of all the functions in `git_config*()` family, `git_config()` has the
> most invocations in the whole code base. Each `git_config()` invocation
> causes config file rereads which can be avoided using the config-set API.
>
> Use the config-set API to rewrite `git_config()` t
Tanay Abhra writes:
> If a callback returns a negative value to `git_config*()` family,
> they call `die()` while printing the line number and the file name.
> Currently the printed line number is off by one, thus printing the
> wrong line number.
>
> Make `linenr` point to the line we just parse
Tanay Abhra writes:
> This series builds on the top of 5def4132 (ta/config-set) in pu or topic[1]
> in the mailing list with name "git config cache & special querying API
> utilizing
> the cache".
>
> This series aims to do these three things,
>
> * Use the config-set API to rewrite git_config()
Ross Boylan writes:
> I still don't know what I need to do to update origin/master in my local
> repo.
>
> Regarding Kevin's suggestion, I just tried "git fetch origin master".
I think Kevin's suggestion was 'To older git, "git fetch origin
master" tells it to fetch master without updating origi
John Keeping writes:
> On Tue, Jul 22, 2014 at 02:17:13PM -0700, Junio C Hamano wrote:
>> John Keeping writes:
>>
>> > Do you want me to re-roll with this change or can you replace the patch
>> > while applying?
>>
>> I think I had to flip the third one to adjust to the change I
>> suggested t
The scenario in the rename test makes unnecessary assumptions about
which file git file-tree will detect as a source for a copy-operations.
Furthermore, copy detection is not tested by checking the resulting
perforce revision history via p4 filelog, but via git diff-tree.
This patch makes the test
On Mon, Jul 7, 2014 at 11:14 PM, Junio C Hamano wrote:
> "Choosing any of these as the copy source is fine" is a sensible way
> to fix the problem with this test. Would it be a better solution to
> avoid having multiple/ambiguous copy source candidates in the first
> place, by the way?
I agree
Nguyễn Thái Ngọc Duy writes:
> "info/grafts" should be part of the "common repository" when accessed
> from a linked checkout (iow $GIT_COMMON_DIR/info/grafts, not
> $GIT_DIR/info/grafts).
>
> git_path("info/grafts") returns correctly, even without this fix,
> because it detects that $GIT_GRAFT_
On Wed, Jul 23, 2014 at 1:03 PM, Ronnie Sahlberg wrote:
> Add (back?) support to make it possible to delete refs that are broken.
>
> Add a new flag REF_ALLOWBROKEN that can be passed to the functions to
> lock a ref. If this flag is set we allow locking the ref even if the
> ref points to a broke
Nguyễn Thái Ngọc Duy writes:
> diff --git a/builtin/checkout.c b/builtin/checkout.c
> index c83f476..d35245a 100644
> --- a/builtin/checkout.c
> +++ b/builtin/checkout.c
> @@ -1006,31 +1006,52 @@ static const char *unique_tracking_name(const char
> *name, unsigned char *sha1)
> return NUL
On Wed, Jul 23, 2014 at 2:42 PM, Tanay Abhra wrote:
> t4018-diff-funcname.sh fails for the new `git_config()` which uses the
> configuration files caching layer internally.
> The test introduced in commit d64d6cdc checks that whether `xfuncname` takes
s/that//
> precedence over `funcname` variab
Tanay Abhra writes:
> Add tests for `git_config_get_string()`, check whether it
> dies printing the line number and the file name if an NULL
a NULL (no n).
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a messag
Tanay Abhra writes:
> Also `funcname` variable is deprecated and not documented properly.
I'd say "purposely undocumented (see 45d9414fa5, Brandon Casey, Sep 18
2008)".
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
To unsubscribe from this list: send the line "unsubscribe git" in
the bod
Nguyễn Thái Ngọc Duy writes:
> There's a code path in prune_repo_dir() that does not initialize 'st'
> buffer, which is checked by the caller, prune_repos_dir(). Instead
> of leaking some prune logic out to prune_repos_dir(), move 'st' into
> prune_repo_dir().
>
> Signed-off-by: Nguyễn Thái Ngọc
Tanay Abhra writes:
> +static int configset_iter(struct config_set *cs, config_fn_t fn, void *data)
> +{
> + int i;
> + struct string_list *strptr;
> + struct config_set_element *entry;
> + struct hashmap_iter iter;
> + hashmap_iter_init(&cs->config_hash, &iter);
> + while
Tanay Abhra writes:
> -int git_config(config_fn_t fn, void *data)
> +static int git_config_raw(config_fn_t fn, void *data)
As you noticed already, this change breaks several tests. You are going
to repair them later in the series, but your patch series produces a
non-bisectable history.
The his
Tanay Abhra writes:
> +test_expect_success 'check line errors for malformed values' '
> + cp .git/config .git/config.old &&
> + test_when_finished "mv .git/config.old .git/config" &&
> + echo "[alias]\n br" >.git/config &&
> + test_expect_code 128 git br 2>result &&
> + grep "
Tanay Abhra writes:
> This series builds on the top of 5def4132 (ta/config-set) in pu or
> topic[1]
Not exactly: 5def4132 has been replaced in pu, and it does not contain
tests, hence PATCH 3 does not apply on top of 5def4132. The series
applies to 0912a24, but does not compile, since you use st
On Tue, Jul 22, 2014 at 02:17:13PM -0700, Junio C Hamano wrote:
> John Keeping writes:
>
> > Do you want me to re-roll with this change or can you replace the patch
> > while applying?
>
> I think I had to flip the third one to adjust to the change I
> suggested to this; the result will be on 'p
Jonathan Nieder writes:
> Hi Sergei,
>
> Sergei Organov wrote:
>
>> --C--
>> / \
>>/ M topic,HEAD
>> / /
>> A---B master
>>
>> shouldn't
>>
>> $ git rebase master
>>
>> be a no-op here?
> [...]
>> I'd expect --force-rebase to be required for this to happen:
>>
>> -f, --
I still don't know what I need to do to update origin/master in my local
repo.
Regarding Kevin's suggestion, I just tried "git fetch origin master".
It seems to have made no difference, at least judging by git show
origin/master. I'm assuming the commit it show is the head of the
branch.
For re
Commit 745224e0 ("refs.c: SSE2 optimizations for check_refname_\
component", 18-06-2014) introduces (on x86_64) the use of sse2
code, and associated header files, to optimize some reference
handling code. This causes sparse to implode and exit with "too
many errors", among other things, while atte
On Wed, 2014-07-23 at 15:09 +0200, Kevin wrote:
>
> On Jul 23, 2014 5:11 AM, "Ross Boylan" wrote:
> >
> > My local master branch is the result of a merge of upstream master
> and
> > some local changes. I want to merge in more recent upstream work.
> > git pull doesn't seem to have updated origi
t4018-diff-funcname.sh fails for the new `git_config()` which uses the
configuration files caching layer internally.
The test introduced in commit d64d6cdc checks that whether `xfuncname` takes
precedence over `funcname` variable which was not guaranteed by config API
previously and worked only bec
This series builds on the top of 5def4132 (ta/config-set) in pu or topic[1]
in the mailing list with name "git config cache & special querying API utilizing
the cache".
This series aims to do these three things,
* Use the config-set API to rewrite git_config().
* Solve any legacy bugs in the pre
Of all the functions in `git_config*()` family, `git_config()` has the
most invocations in the whole code base. Each `git_config()` invocation
causes config file rereads which can be avoided using the config-set API.
Use the config-set API to rewrite `git_config()` to use the config caching
layer
Store file name and line number for each key-value pair in the cache.
Use the information to print line number and file name in errors raised
by `git_config()` which now uses the configuration files caching layer
internally.
Signed-off-by: Tanay Abhra
---
config.c | 32 ++
Add `git_die_config` that dies printing the line number and the file name
of the highest priority value for the configuration variable `key`.
It has usage in non-callback based config value retrieval where we can
raise an error and die if there is a semantic error.
For example,
if (!git_c
Semantic errors (for example, for alias.* variables NULL values are
not allowed) in configuration files cause a die printing the line
number and file name of the offending value.
Add a test documenting that such errors cause a die printing the
accurate line number and file name.
Signed-off-by: Ta
Add tests for `git_config_get_string()`, check whether it
dies printing the line number and the file name if an NULL
value is retrieved for the given key.
Signed-off-by: Tanay Abhra
---
t/t1308-config-set.sh | 9 +
test-config.c | 10 ++
2 files changed, 19 insertions(+)
If a callback returns a negative value to `git_config*()` family,
they call `die()` while printing the line number and the file name.
Currently the printed line number is off by one, thus printing the
wrong line number.
Make `linenr` point to the line we just parsed during the call
to callback to
Karsten Blees writes:
> Am 22.07.2014 23:44, schrieb Junio C Hamano:
>>
>> * sk/mingw-uni-fix-more (2014-07-21) 14 commits
>> ...
>> * sk/mingw-tests-workaround (2014-07-21) 6 commits
>> ...
>
> Yes, I think both series are ready.
>
> Compiles with msysgit and MSVC (with NO_CURL=1).
Thanks.
>
"Philip Oakley" writes:
>> * po/everyday-doc (2014-01-27) 1 commit
>> - Make 'git help everyday' work
>>
>> This may make the said command to emit something, but the source is
>> not meant to be formatted into a manual pages to begin with, and
>> also its contents are a bit stale.
>
>> It may be
Stefan Beller writes:
> A git command is generally setup as:
> git [] [] ...
>
> The subcommands vary wildly by the nature of the command. However all
> subcommands
> could at least follow one style. The commands bundle, notes, stash and
> submodule
> have subcommands without two leading d
Hi Sergei,
Sergei Organov wrote:
> --C--
> / \
>/ M topic,HEAD
> / /
> A---B master
>
> shouldn't
>
> $ git rebase master
>
> be a no-op here?
[...]
> I'd expect --force-rebase to be required for this to happen:
>
> -f, --force-rebase
> Force the rebase even if the
Michael J Gruber writes:
>> +if (advice_checkout_to)
>> +die(_("%s is already checked out at %s.\n"
>> + "Either use --detach or -b together with --to "
>> + "or switch branch in the the other checkout."),
>
> "or switch to a different branch in t
Matthieu Moy writes:
> Junio C Hamano writes:
>
>> *1* We have safe_create_leading_directories_const() that works
>> around this for input parameter around its _const less counterpart,
>> which is ugly but livable solution.
>
> I think it would actually be a reasonable solution to avoid casting
No one is using this function so we can delete it.
Signed-off-by: Ronnie Sahlberg
---
refs.c | 7 ---
refs.h | 10 +-
2 files changed, 1 insertion(+), 16 deletions(-)
diff --git a/refs.c b/refs.c
index b74e5ff..0ead11f 100644
--- a/refs.c
+++ b/refs.c
@@ -,13 +,6 @@ static
Add (back?) support to make it possible to delete refs that are broken.
Add a new flag REF_ALLOWBROKEN that can be passed to the functions to
lock a ref. If this flag is set we allow locking the ref even if the
ref points to a broken sha1. For example a sha1 that is created by :
echo "Broken r
Allow to make multiple reflog updates to the same ref during a transaction.
This means we only need to lock the reflog once, during the first update
that touches the reflog, and that all further updates can just write the
reflog entry since the reflog is already locked.
This allows us to write cod
unlock|close|commit_ref can be made static since there are no more external
callers.
Signed-off-by: Ronnie Sahlberg
---
refs.c | 24
refs.h | 9 -
2 files changed, 12 insertions(+), 21 deletions(-)
diff --git a/refs.c b/refs.c
index b7940e0..b74e5ff 100644
---
Use a transaction for all updates during expire_reflog.
Signed-off-by: Ronnie Sahlberg
---
builtin/reflog.c | 84
refs.c | 4 +--
refs.h | 2 +-
3 files changed, 39 insertions(+), 51 deletions(-)
diff --git a/builtin
Rename the transaction functions. Remove the leading ref_ from the
names and append _sha1 to the names for functions that create/delete/
update sha1 refs.
Signed-off-by: Ronnie Sahlberg
---
branch.c | 11 ---
builtin/commit.c | 14 -
builtin/fetch.c| 12 ++
Break out the code to create the string and writing it to the file
descriptor from log_ref_write and into a dedicated function log_ref_write_fd.
For now this is only used from log_ref_write but later on we will call
this function from reflog transactions too which means that we will end
up with onl
log_ref_setup is used to do several semi-related things :
* sometimes it will create a new reflog including missing parent directories
and cleaning up any conflicting stale directories in the path.
* fill in a filename buffer for the full path to the reflog.
* unconditionally re-adjust the permis
When performing a reflog transaction update, only write to the reflog iff
msg is non-NULL. This can then be combined with REFLOG_TRUNCATE to perform
an update that only truncates but does not write.
Signed-off-by: Ronnie Sahlberg
---
refs.c | 5 +++--
refs.h | 1 +
2 files changed, 4 insertions(
Signed-off-by: Ronnie Sahlberg
---
refs.c | 17 +
refs.h | 2 +-
2 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/refs.c b/refs.c
index 8f2aa3a..74fb797 100644
--- a/refs.c
+++ b/refs.c
@@ -3506,24 +3506,17 @@ int ref_transaction_delete(struct ref_transaction
*tra
Define a new transaction update type, UPDATE_LOG, and a new function
transaction_update_reflog. This function will lock the reflog and append
an entry to it during transaction commit.
Signed-off-by: Ronnie Sahlberg
---
refs.c | 103 +++-
Add a flag that allows us to truncate the reflog before we write the
update.
Signed-off-by: Ronnie Sahlberg
---
refs.c | 17 +++--
refs.h | 10 +-
2 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/refs.c b/refs.c
index b010d6d..181c957 100644
--- a/refs.c
+++ b/
Signed-off-by: Ronnie Sahlberg
---
refs.c | 18 ++
refs.h | 7 ---
2 files changed, 6 insertions(+), 19 deletions(-)
diff --git a/refs.c b/refs.c
index 6dcb920..8f2aa3a 100644
--- a/refs.c
+++ b/refs.c
@@ -3490,28 +3490,14 @@ int ref_transaction_create(struct ref_transaction
Update hold_lock_file_for_append and copy_fd to return a meaningful errno
on failure.
Signed-off-by: Ronnie Sahlberg
---
copy.c | 20 +---
lockfile.c | 7 ++-
2 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/copy.c b/copy.c
index a7f58fd..5cb8679 100644
--
List, Jun,
This is the next patch series for ref-transactions.
It is also available at
https://github.com/rsahlberg/git/tree/ref-transactions-reflog
and is the same patch series that has been posted previously with one
exception:
This series now contains an additional patch that fixes ref handl
Add a field that describes what type of update this refers to. For now
the only type is UPDATE_SHA1 but we will soon add more types.
Signed-off-by: Ronnie Sahlberg
---
refs.c | 25 +
1 file changed, 21 insertions(+), 4 deletions(-)
diff --git a/refs.c b/refs.c
index 9116
Am 22.07.2014 23:44, schrieb Junio C Hamano:
>
> * sk/mingw-uni-fix-more (2014-07-21) 14 commits
> - Win32: enable color output in Windows cmd.exe
> - Win32: patch Windows environment on startup
> - Win32: keep the environment sorted
> - Win32: use low-level memory allocation during initializa
Nguyễn Thái Ngọc Duy venit, vidit, dixit 23.07.2014 13:43:
> Give the user a choice in this case. If they want to detach, they can go
> with '--detach --to ...', or they could switch branch of the checkout
> that's holding the ref in question. Or they could just create a new
> branch with '-b xxx -
In the user survey 2012 question 23 ("In your opinion, which areas in
Git need improvement?"),
the most crucial point identified was the user interface.
I wonder if there are any more recent surveys, showing if this has changed.
Now when we want to improve the user interface, we're likely talking
a
Hello,
$ git --version
git version 1.9.3
Please consider the following history:
--C--
/ \
/ M topic,HEAD
/ /
A---B master
shouldn't
$ git rebase master
be a no-op here? According to my reading of the rebase manual page, it
should be a no-op, as 'topic' is a descenda
On Jul 23, 2014 5:11 AM, "Ross Boylan" wrote:
>
> My local master branch is the result of a merge of upstream master and
> some local changes. I want to merge in more recent upstream work.
> git pull doesn't seem to have updated origin/master, and git checkout
> origin/master also doesn't seem to
Am 23.07.2014 13:53, schrieb Duy Nguyen:
> On Wed, Jul 23, 2014 at 2:35 AM, René Scharfe wrote:
>> Am 21.07.2014 16:13, schrieb Duy Nguyen:
>>
>>> This function tests if $PWD is the same as getcwd() using st_dev and
>>> st_ino. But on Windows these fields are always zero
>>> (mingw.c:do_lstat). If
According to http://meta.ohloh.net/2014/07/black-duck-open-hub/
the site name of ohloh changed to openhub.
Change the man page accordingly.
Signed-off-by: Stefan Beller
---
Documentation/git.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/git.txt b/Documenta
Google mail has had the extension @googlemail.com for a long time
in Germany as @gmail.de was already taken by a competitor.
Nowadays the original gmail company isn't there anymore(?), hence
Googlemail also introduced @gmail.com in Germany, which I switched to.
This changed mail address of mine fi
On Tue, Jul 22, 2014 at 12:04 AM, Junio C Hamano wrote:
> Duy Nguyen writes:
>
>> On Mon, Jul 21, 2014 at 8:27 PM, Ramsay Jones
>> wrote:
+void make_locked_paths_absolute(void)
+{
+ struct lock_file *lk;
+ for (lk = lock_file_list; lk != NULL; lk = lk->next) {
+
On Wed, Jul 23, 2014 at 2:35 AM, René Scharfe wrote:
> Am 21.07.2014 16:13, schrieb Duy Nguyen:
>
>> This function tests if $PWD is the same as getcwd() using st_dev and
>> st_ino. But on Windows these fields are always zero
>> (mingw.c:do_lstat). If cwd is moved away, I think falling back to $PWD
Give the user a choice in this case. If they want to detach, they can go
with '--detach --to ...', or they could switch branch of the checkout
that's holding the ref in question. Or they could just create a new
branch with '-b xxx --to yyy'
Signed-off-by: Nguyễn Thái Ngọc Duy
---
Documentation/c
"info/grafts" should be part of the "common repository" when accessed
from a linked checkout (iow $GIT_COMMON_DIR/info/grafts, not
$GIT_DIR/info/grafts).
git_path("info/grafts") returns correctly, even without this fix,
because it detects that $GIT_GRAFT_FILE is not set, so it goes with the
common
junk_git_dir is set to sb_repo.buf. By the end of prepare_linked_checkout(),
sb_repo is freed and so junk_git_dir points to nowhere. If the second
checkout command fails, is_junk remains non-zero, remove_junk() will
be called and try to clean junk_git_dir, which could be anything now
(if it does no
There's a code path in prune_repo_dir() that does not initialize 'st'
buffer, which is checked by the caller, prune_repos_dir(). Instead
of leaking some prune logic out to prune_repos_dir(), move 'st' into
prune_repo_dir().
Signed-off-by: Nguyễn Thái Ngọc Duy
---
builtin/prune.c
Signed-off-by: Nguyễn Thái Ngọc Duy
---
Documentation/gitrepository-layout.txt | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Documentation/gitrepository-layout.txt
b/Documentation/gitrepository-layout.txt
index bed4f1a..6bd82af 100644
--- a/Documentation/gitrepository
The series has entered 'next' so I can't replace patches any more.
Besides the brown paper bag fixes, checkout now rejects if a branch is
already checked out elsewhere.
Nguyễn Thái Ngọc Duy (5):
gitrepository-layout.txt: s/ignored/ignored if/
prune --repos: fix uninitialized access
checkout
Junio C Hamano writes:
> *1* We have safe_create_leading_directories_const() that works
> around this for input parameter around its _const less counterpart,
> which is ugly but livable solution.
I think it would actually be a reasonable solution to avoid casting here
and there on the caller sid
On Mon, Jul 21, 2014 at 6:55 AM, Eric Sunshine wrote:
>> @@ -848,13 +878,21 @@ static int prepare_linked_checkout(const struct
>> checkout_opts *opts,
>> strbuf_addf(&sb_repo, "%d", counter);
>> }
>> name = strrchr(sb_repo.buf, '/') + 1;
>> +
>> + junk_pid =
On 23/07/14 14:49, Ross Boylan wrote:
> My local master branch is the result of a merge of upstream master and
> some local changes. I want to merge in more recent upstream work.
> git pull doesn't seem to have updated origin/master, and git checkout
> origin/master also doesn't seem to work.
>
>
91 matches
Mail list logo
