* [PATCH] dir.h: remove orphaned declaration
@ 2015-12-30 17:11 Ramsay Jones
2015-12-30 20:40 ` Christian Couder
0 siblings, 1 reply; 2+ messages in thread
From: Ramsay Jones @ 2015-12-30 17:11 UTC (permalink / raw)
To: Christian Couder; +Cc: Junio C Hamano, GIT Mailing-list
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(-)
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] dir.h: remove orphaned declaration
2015-12-30 17:11 [PATCH] dir.h: remove orphaned declaration Ramsay Jones
@ 2015-12-30 20:40 ` Christian Couder
0 siblings, 0 replies; 2+ messages in thread
From: Christian Couder @ 2015-12-30 20:40 UTC (permalink / raw)
To: Ramsay Jones; +Cc: Junio C Hamano, GIT Mailing-list
Hi Ramsay,
On Wed, Dec 30, 2015 at 6:11 PM, Ramsay Jones
<ramsay@ramsayjones.plus.com> wrote:
>
> 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.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-12-30 20:40 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-12-30 17:11 [PATCH] dir.h: remove orphaned declaration Ramsay Jones
2015-12-30 20:40 ` Christian Couder
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox