threads / patch / 41099

patchdir.h: remove orphaned declaration

Subject: [PATCH] dir.h: remove orphaned declaration

## tl;dr

2 messages between Dec 30, 2015 and Dec 30, 2015. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

Ramsay Jones· Dec 30, 2015, 17:11 UTC · lore

Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
---

Hi Christian,

If you need to re-roll your 'cc/untracked' branch, could you please squash this into your patches.

You seem to have only half applied my last fixup patch! ;-) (I'm guessing that you had already renamed the function locally before I sent the fixup).

Thanks!

ATB, Ramsay Jones

 dir.h | 1 -
 1 file changed, 1 deletion(-)

Show changes to dir.h +0 −1

diff --git a/dir.h b/dir.h
index 3e5114d..85286e5 100644
--- a/dir.h
+++ b/dir.h
@@ -307,7 +307,6 @@ void untracked_cache_add_to_index(struct index_state *, const char *);
 void free_untracked_cache(struct untracked_cache *);
 struct untracked_cache *read_untracked_extension(const void *data, unsigned long sz);
 void write_untracked_extension(struct strbuf *out, struct untracked_cache *untracked);
-void add_untracked_ident(struct untracked_cache *);
 void add_untracked_cache(void);
 void remove_untracked_cache(void);
 #endif

-- 
2.6.0

Christian Couder· Dec 30, 2015, 20:40 UTC · re: Ramsay Jones · lore

Re: [PATCH] dir.h: remove orphaned declaration

Hi Ramsay,

On Wed, Dec 30, 2015 at 6:11 PM, Ramsay Jones <ramsay@ramsayjones.plus.com> wrote:

Show 12 quoted lines

>
> Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
> ---
>
> Hi Christian,
>
> If you need to re-roll your 'cc/untracked' branch, could you
> please squash this into your patches.
>
> You seem to have only half applied my last fixup patch! ;-)
> (I'm guessing that you had already renamed the function
> locally before I sent the fixup).

Sorry I completely overlooked your previous patch.

This patch is now squashed into my current series:

https://github.com/chriscool/git/commits/uc-notifs42

(See https://github.com/chriscool/git/commit/699cd541a863ce027e20ded1c3d7300e146ccfd5.)

Thanks, Christian.